tools: more adjustments

bpftrace · Jun 8, 2019 · 9dbee04 · 9dbee04
1 parent a189c36
commit 9dbee04
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/tools/biolatency.bt b/tools/biolatency.bt
@@ -21,10 +21,15 @@ kprobe:blk_account_io_start
 	@start[arg0] = nsecs;
 }
 
-kprobe:blk_account_io_completion
+kprobe:blk_account_io_done
 /@start[arg0]/
 
 {
 	@usecs = hist((nsecs - @start[arg0]) / 1000);
 	delete(@start[arg0]);
 }
+
+END
+{
+	clear(@start);
+}
diff --git a/tools/biosnoop.bt b/tools/biosnoop.bt
@@ -22,9 +22,8 @@ kprobe:blk_account_io_start
 	@iocomm[arg0] = comm;
 }
 
-kprobe:blk_account_io_completion
+kprobe:blk_account_io_done
 /@start[arg0] != 0 && @iopid[arg0] != 0 && @iocomm[arg0] != ""/
-
 {
 	$now = nsecs;
 	printf("%-12u %-16s %-6d %7d\n",
@@ -35,3 +34,10 @@ kprobe:blk_account_io_completion
 	delete(@iopid[arg0]);
 	delete(@iocomm[arg0]);
 }
+
+END
+{
+	clear(@start);
+	clear(@iopid);
+	clear(@iocomm);
+}
diff --git a/tools/bitesize.bt b/tools/bitesize.bt
@@ -16,12 +16,11 @@
 BEGIN
 {
 	printf("Tracing block device I/O... Hit Ctrl-C to end.\n");
-
 }
 
 tracepoint:block:block_rq_issue
 {
-	@[comm] = hist(args->bytes);
+	@[args->comm] = hist(args->bytes);
 }
 
 END

diff --git a/tools/loads.bt b/tools/loads.bt
@@ -20,7 +20,6 @@
 BEGIN
 {
 	printf("Reading load averages... Hit Ctrl-C to end.\n");
-
 }
 
 interval:s:1