From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RH43u-0000Rf-Da for qemu-devel@nongnu.org; Thu, 20 Oct 2011 21:38:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RH43s-0005KT-Q0 for qemu-devel@nongnu.org; Thu, 20 Oct 2011 21:38:18 -0400 Received: from mail-yw0-f45.google.com ([209.85.213.45]:39247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RH43s-0005K9-Mt for qemu-devel@nongnu.org; Thu, 20 Oct 2011 21:38:16 -0400 Received: by ywp17 with SMTP id 17so4122576ywp.4 for ; Thu, 20 Oct 2011 18:38:15 -0700 (PDT) Message-ID: <4EA0CCED.5080305@gmail.com> Date: Fri, 21 Oct 2011 09:37:49 +0800 From: "Mars.Cao" MIME-Version: 1.0 References: <1319103503-12634-1-git-send-email-wudxw@linux.vnet.ibm.com> In-Reply-To: <1319103503-12634-1-git-send-email-wudxw@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] Add wildcard trace event support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Wu Cc: stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org On 10/20/2011 05:38 PM, Mark Wu wrote: > 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 > --- > docs/tracing.txt | 9 ++++++++- > trace/simple.c | 19 +++++++++++++++++-- > trace/stderr.c | 17 ++++++++++++++++- > 3 files changed, 41 insertions(+), 4 deletions(-) > > diff --git a/docs/tracing.txt b/docs/tracing.txt > index 95ca16c..ea29f2c 100644 > --- a/docs/tracing.txt > +++ b/docs/tracing.txt > @@ -132,12 +132,19 @@ This functionality is also provided through monitor commands: > means disabled. > > * trace-event NAME on|off > - Enable/disable a given trace event. > + Enable/disable a given trace event or a group of events having common prefix > + through wildcard. > > The "-trace events=" command line argument can be used to enable the > events listed in from the very beginning of the program. This file must > contain one event name per line. > > +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 > + > == Trace backends == > > The "tracetool" script automates tedious trace event code generation and also > diff --git a/trace/simple.c b/trace/simple.c > index b639dda..869e315 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 (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 7107c4a..6a12977 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 (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) I do think this idea of using wildcard (from Stefanha) is smarter than trace groups. I did not find anything wrong with the code although it does not support events with wildcard like "virtio_*_init". Reviewed-by: Cao,Bing Bu Tested-by: Cao,Bing Bu