Skip to contentSkip to conversation

zedtrace: use block tracepoints

PATCH In review Tom Zanussi 1 participant 1 message Feb 27, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 3/4 zedtrace: use block tracepoints

Add support for the block tracepoints.

---
 kernel/trace/trace_binary/Makefile    |    2 +-
 kernel/trace/trace_binary/zed.c       |    7 +
 kernel/trace/trace_binary/zed.h       |   18 ++
 kernel/trace/trace_binary/zed_block.c |  516 +++++++++++++++++++++++++++++++++
 kernel/trace/trace_binary/zed_block.h |  172 +++++++++++
 5 files changed, 714 insertions(+), 1 deletions(-)
 create mode 100644 kernel/trace/trace_binary/zed_block.c
 create mode 100644 kernel/trace/trace_binary/zed_block.h
kernel/trace/trace_binary/Makefile +1 -1
index 26b3c8e..89fceba 100644
@@ -1,3 +1,3 @@
 obj-$(CONFIG_ZEDTRACE) += zedtrace.o
 
-zedtrace-objs := zed.o zed_filter.o zed_sched.o
+zedtrace-objs := zed.o zed_filter.o zed_sched.o zed_block.o
kernel/trace/trace_binary/zed.c +7 -0
index 13d301e..5fb61dc 100644
@@ -24,6 +24,7 @@
 #include <linux/vmalloc.h>
 #include <linux/debugfs.h>
 #include <trace/sched.h>
+#include <trace/block.h>
 #include "zed.h"
 #include "zed_filter.h"
 
@@ -987,6 +988,10 @@ static int zed_enable_tracepoints(void)
 		printk(KERN_ERR "Couldn't register sched tracepoints.\n");
 		goto fail;
 	}
+	if (zed_enable_block_tracepoints()) {
+		printk(KERN_ERR "Couldn't register block tracepoints.\n");
+		goto fail;
+	}
 	return 0;
 fail:
 	return -1;
@@ -995,11 +1000,13 @@ fail:
 static void zed_disable_tracepoints(void)
 {
 	zed_disable_sched_tracepoints();
+	zed_disable_block_tracepoints();
 }
 
 static void zed_init_subsystems(void)
 {
 	zed_sched_init();
+	zed_block_init();
 }
 
 /**
kernel/trace/trace_binary/zed.h +18 -0
index 56a6295..7f86f3b 100644
@@ -56,8 +56,26 @@
 	EVENT(sched, process_wait_trace) sep \
 	EVENT(sched, process_fork_trace) sep \
 	EVENT(sched, signal_send_trace) sep \
+	EVENT(block, rq_abort_trace) sep \
+	EVENT(block, rq_insert_trace) sep \
+	EVENT(block, rq_issue_trace) sep \
+	EVENT(block, rq_requeue_trace) sep \
+	EVENT(block, rq_complete_trace) sep \
+	EVENT(block, bio_bounce_trace) sep \
+	EVENT(block, bio_complete_trace) sep \
+	EVENT(block, bio_backmerge_trace) sep \
+	EVENT(block, bio_frontmerge_trace) sep \
+	EVENT(block, bio_queue_trace) sep \
+	EVENT(block, getrq_trace) sep \
+	EVENT(block, sleeprq_trace) sep	\
+	EVENT(block, plug_trace) sep \
+	EVENT(block, unplug_io_trace) sep \
+	EVENT(block, unplug_timer_trace) sep \
+	EVENT(block, split_trace) sep \
+	EVENT(block, remap_trace) sep \
 
 #include "zed_sched.h"
+#include "zed_block.h"
 
 /* magic or'ed with version, last byte of magic should be 00 */
 #define ZED_TRACE_MAGIC		0x26F82100
kernel/trace/trace_binary/zed_block.c new file +516 -0

516 lines not on this page · raw message

kernel/trace/trace_binary/zed_block.h new file +172 -0

172 lines not on this page · raw message

Signature · 1 line
1.5.6.3