Skip to content

Commit 5b87521

Browse files
committed
Merge bitcoin/bitcoin#32454: tracing: fix invalid argument in mempool_monitor
31c5ebc tracing: fix invalid argument in mempool_monitor (William Casarin) Pull request description: The mempool_monitor tracing tool is incorrectly reading the reason as the first argument. Fix this! Noticed this during the bitcoin++ mempool hackathon 😅 cc 0xB10C ACKs for top commit: 0xB10C: Code Review ACK 31c5ebc Tree-SHA512: 6f3d64f0f75a44e1fdcad71af8e737ce948833498cd3879ef74cbabf53e3649145b83febceca19b1662de55346c199bf4259e17f5b28cf0352aefa730e07ea63
2 parents ad5cd12 + 31c5ebc commit 5b87521

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/tracing/mempool_monitor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
void *phash = NULL, *preason = NULL;
8181
bpf_usdt_readarg(1, ctx, phash);
8282
bpf_probe_read_user(&removed.hash, sizeof(removed.hash), phash);
83-
bpf_usdt_readarg(1, ctx, preason);
83+
bpf_usdt_readarg(2, ctx, preason);
8484
bpf_probe_read_user_str(&removed.reason, sizeof(removed.reason), preason);
8585
bpf_usdt_readarg(3, ctx, &removed.vsize);
8686
bpf_usdt_readarg(4, ctx, &removed.fee);
@@ -95,7 +95,7 @@
9595
void *phash = NULL, *preason = NULL;
9696
bpf_usdt_readarg(1, ctx, phash);
9797
bpf_probe_read_user(&rejected.hash, sizeof(rejected.hash), phash);
98-
bpf_usdt_readarg(1, ctx, preason);
98+
bpf_usdt_readarg(2, ctx, preason);
9999
bpf_probe_read_user_str(&rejected.reason, sizeof(rejected.reason), preason);
100100
rejected_events.perf_submit(ctx, &rejected, sizeof(rejected));
101101
return 0;

0 commit comments

Comments
 (0)