From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvrTU-0007mR-JE for qemu-devel@nongnu.org; Fri, 10 Feb 2012 09:29:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RvrTK-0006m9-9c for qemu-devel@nongnu.org; Fri, 10 Feb 2012 09:29:20 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:51703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvrTJ-0006lt-W6 for qemu-devel@nongnu.org; Fri, 10 Feb 2012 09:29:10 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Fri, 10 Feb 2012 15:29:00 +0100 Message-ID: <20120210142900.13518.52743.stgit@ginnungagap.bsc.es> In-Reply-To: <20120210142832.13518.22003.stgit@ginnungagap.bsc.es> References: <20120210142832.13518.22003.stgit@ginnungagap.bsc.es> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 5/6] trace: [simple] Port to generic event information and new control interface List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, stefanha@gmail.com Signed-off-by: Llu=C3=ADs Vilanova --- scripts/tracetool.py | 29 ++++++++++------------------- trace/simple.c | 33 ++++++--------------------------- trace/simple.h | 6 +----- trace/stderr.h | 11 ----------- 4 files changed, 17 insertions(+), 62 deletions(-) delete mode 100644 trace/stderr.h diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 724b595..98a8ca8 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -265,28 +265,18 @@ def simple_h(events): 'name': event.name, 'args': event.args } - print - print '#define NR_TRACE_EVENTS %d' % len(events) - print 'extern TraceEvent trace_list[NR_TRACE_EVENTS];' =20 @for_backend("simple", "c") def simple_c(events): rec_off =3D 0 - print '#include "trace.h"' - print '#include "trace/simple.h"' - print - print 'TraceEvent trace_list[] =3D {' - print - for event in events: - print '{.tp_name =3D "%(name)s", .state=3D0},' % { - 'name': event.name -} - print - print '};' - print + print """\ +#include "trace.h" +#include "trace/control.h" +#include "trace/simple.h" +""" =20 - for num, event in enumerate(events): - sizes =3D [] + for event in events: + sizes =3D ["0"] for type_, name in event.args: if type_is_string(type_): sizes.append("4 + strlen(%s)" % name) @@ -301,7 +291,8 @@ def simple_c(events): uint64_t pvar64 __attribute__ ((unused)); uint32_t slen __attribute__ ((unused)); =20 - if (!trace_list[%(event_id)s].state) { + bool _state =3D trace_event_get_state(%(event_id)s); + if (!_state) { return; } =20 @@ -310,7 +301,7 @@ def simple_c(events): ''' % { 'name': event.name, 'args': event.args, - 'event_id': num, + 'event_id': "TRACE_" + event.name.upper(), 'sizestr' : sizestr, } =20 diff --git a/trace/simple.c b/trace/simple.c index f5aa3bd..3c99923 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -263,38 +263,17 @@ void trace_print_events(FILE *stream, fprintf_funct= ion stream_printf) { unsigned int i; =20 - for (i =3D 0; i < NR_TRACE_EVENTS; i++) { + for (i =3D 0; i < trace_event_count(); i++) { + TraceEvent *ev =3D trace_event_id(i); stream_printf(stream, "%s [Event ID %u] : state %u\n", - trace_list[i].tp_name, i, trace_list[i].state); + trace_event_get_name(ev), i, trace_event_get_state= _dynamic(ev)); } } =20 -bool trace_event_set_state(const char *name, bool state) +void trace_event_set_state_dynamic(TraceEvent *ev, bool state) { - unsigned int i; - unsigned int len; - bool wildcard =3D false; - bool matched =3D false; - - len =3D strlen(name); - if (len > 0 && name[len - 1] =3D=3D '*') { - wildcard =3D true; - len -=3D 1; - } - for (i =3D 0; i < NR_TRACE_EVENTS; i++) { - if (wildcard) { - if (!strncmp(trace_list[i].tp_name, name, len)) { - trace_list[i].state =3D state; - matched =3D true; - } - continue; - } - if (!strcmp(trace_list[i].tp_name, name)) { - trace_list[i].state =3D state; - return true; - } - } - return matched; + assert(ev !=3D NULL); + ev->dstate =3D state; } =20 /* Helper function to create a thread with signals blocked. Use glib's diff --git a/trace/simple.h b/trace/simple.h index 671cbeb..6850ac5 100644 --- a/trace/simple.h +++ b/trace/simple.h @@ -15,12 +15,8 @@ #include #include =20 -typedef uint64_t TraceEventID; +#include "trace-events.h" =20 -typedef struct { - const char *tp_name; - bool state; -} TraceEvent; =20 void st_print_trace(FILE *stream, fprintf_function stream_printf); void st_print_trace_file_status(FILE *stream, fprintf_function stream_pr= intf); diff --git a/trace/stderr.h b/trace/stderr.h deleted file mode 100644 index d575b61..0000000 --- a/trace/stderr.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef TRACE_STDERR_H -#define TRACE_STDERR_H - -typedef uint64_t TraceEventID; - -typedef struct { - const char *tp_name; - bool state; -} TraceEvent; - -#endif /* ! TRACE_STDERR_H */