mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-09-19 06:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: expand radix merge tracing

Browse Source 
Add a trace event for entering _radix_merge() and rename the current
per-merge trace event.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2020-08-26 14:39:12 -07:00
committed by Zach Brown
parent 5c6b263d97
commit ba879b977a
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/radix.c
+11 -4
View File
@@ -1341,6 +1341,12 @@ int scoutfs_radix_merge(struct super_block *sb,
int ind;
int ret;
trace_scoutfs_radix_merge(sb, le64_to_cpu(dst->ref.blkno),
le64_to_cpu(dst->ref.sm_total),
le64_to_cpu(src->ref.blkno),
le64_to_cpu(src->ref.sm_total),
le64_to_cpu(inp->ref.blkno),
le64_to_cpu(inp->ref.sm_total), count);
scoutfs_inc_counter(sb, radix_merge);
mutex_lock(&alloc->mutex);
@@ -1426,10 +1432,11 @@ wrapped:
fixup_parent_refs(sb, src_bl, -merged, -src_lg_delta);
fixup_parent_refs(sb, dst_bl, merged, dst_lg_delta);
trace_scoutfs_radix_merge(sb, inp, inp_bl->blkno, src,
src_bl->blkno, dst, dst_bl->blkno,
count, bit, ind, merged,
src_lg_delta, dst_lg_delta);
trace_scoutfs_radix_merged_blocks(sb, inp, inp_bl->blkno, src,
src_bl->blkno, dst,
dst_bl->blkno, count, bit,
ind, merged, src_lg_delta,
dst_lg_delta);
complete_change(sb, wri, &chg, 0);
kmod/src/scoutfs_trace.h
+32
View File
@@ -2463,6 +2463,38 @@ DEFINE_EVENT(scoutfs_radix_bitop, scoutfs_radix_set_bits,
);
TRACE_EVENT(scoutfs_radix_merge,
TP_PROTO(struct super_block *sb, u64 dst_blkno, u64 dst_sm_tot,
u64 src_blkno, u64 src_sm_tot, u64 inp_blkno, u64 inp_sm_tot,
u64 count),
TP_ARGS(sb, dst_blkno, dst_sm_tot, src_blkno, src_sm_tot, inp_blkno,
inp_sm_tot, count),
TP_STRUCT__entry(
SCSB_TRACE_FIELDS
__field(__u64, dst_blkno)
__field(__u64, dst_sm_tot)
__field(__u64, src_blkno)
__field(__u64, src_sm_tot)
__field(__u64, inp_blkno)
__field(__u64, inp_sm_tot)
__field(__u64, count)
),
TP_fast_assign(
SCSB_TRACE_ASSIGN(sb);
__entry->dst_blkno = dst_blkno;
__entry->dst_sm_tot = dst_sm_tot;
__entry->src_blkno = src_blkno;
__entry->src_sm_tot = src_sm_tot;
__entry->inp_blkno = inp_blkno;
__entry->inp_sm_tot = inp_sm_tot;
__entry->count = count;
),
TP_printk(SCSBF" d_blkno %llu d_sm_tot %llu s_blkno %llu s_sm_tot %llu i_blkno %llu i_sm_tot %llu count %llu",
SCSB_TRACE_ARGS, __entry->dst_blkno, __entry->dst_sm_tot,
__entry->src_blkno, __entry->src_sm_tot, __entry->inp_blkno,
__entry->inp_sm_tot, __entry->count)
);
TRACE_EVENT(scoutfs_radix_merged_blocks,
TP_PROTO(struct super_block *sb,
struct scoutfs_radix_root *inp, u64 inp_blkno,
struct scoutfs_radix_root *src, u64 src_blkno,