From 454e202d52a517c631cb750ba65ff8079c08b301 Mon Sep 17 00:00:00 2001 From: Mark Wu Date: Mon, 31 Oct 2011 11:29:04 +0800 Subject: trace: Add wildcard trace event support A basic wildcard matching is supported in both the monitor command "trace-event" and the events list file. That means you can enable/disable the events having a common prefix in a batch. For example, virtio-blk trace events could be enabled using: trace-event virtio_blk_* on Signed-off-by: Mark Wu Signed-off-by: Stefan Hajnoczi --- trace/simple.c | 19 +++++++++++++++++-- trace/stderr.c | 17 ++++++++++++++++- 2 files changed, 33 insertions(+), 3 deletions(-) (limited to 'trace') diff --git a/trace/simple.c b/trace/simple.c index b639dda806..6339152d27 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -324,14 +324,29 @@ void trace_print_events(FILE *stream, fprintf_function stream_printf) bool trace_event_set_state(const char *name, bool state) { unsigned int i; - + unsigned int len; + bool wildcard = false; + bool matched = false; + + len = strlen(name); + if (len > 0 && name[len - 1] == '*') { + wildcard = true; + len -= 1; + } for (i = 0; i < NR_TRACE_EVENTS; i++) { + if (wildcard) { + if (!strncmp(trace_list[i].tp_name, name, len)) { + trace_list[i].state = state; + matched = true; + } + continue; + } if (!strcmp(trace_list[i].tp_name, name)) { trace_list[i].state = state; return true; } } - return false; + return matched; } /* Helper function to create a thread with signals blocked. Use glib's diff --git a/trace/stderr.c b/trace/stderr.c index 7107c4a131..0810d6f956 100644 --- a/trace/stderr.c +++ b/trace/stderr.c @@ -15,14 +15,29 @@ void trace_print_events(FILE *stream, fprintf_function stream_printf) bool trace_event_set_state(const char *name, bool state) { unsigned int i; + unsigned int len; + bool wildcard = false; + bool matched = false; + len = strlen(name); + if (len > 0 && name[len - 1] == '*') { + wildcard = true; + len -= 1; + } for (i = 0; i < NR_TRACE_EVENTS; i++) { + if (wildcard) { + if (!strncmp(trace_list[i].tp_name, name, len)) { + trace_list[i].state = state; + matched = true; + } + continue; + } if (!strcmp(trace_list[i].tp_name, name)) { trace_list[i].state = state; return true; } } - return false; + return matched; } bool trace_backend_init(const char *events, const char *file) -- cgit v1.2.1