From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuP61-0004uB-Ql for qemu-devel@nongnu.org; Mon, 06 Feb 2012 08:59:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RuP5s-0004ge-Kw for qemu-devel@nongnu.org; Mon, 06 Feb 2012 08:59:05 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:33874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RuP5s-0004fX-5k for qemu-devel@nongnu.org; Mon, 06 Feb 2012 08:58:56 -0500 From: =?utf-8?b?TGx1w61z?= Vilanova Date: Mon, 06 Feb 2012 14:58:44 +0100 Message-ID: <20120206135844.10855.55655.stgit@ginnungagap.bsc.es> In-Reply-To: <20120206135712.10855.74640.stgit@ginnungagap.bsc.es> References: <20120206135712.10855.74640.stgit@ginnungagap.bsc.es> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 6/6] trace: [stderr] 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 | 26 ++++++++------------------ trace/stderr.c | 34 ++++++---------------------------- 2 files changed, 14 insertions(+), 46 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 98a8ca8..a3135b8 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -348,10 +348,10 @@ def simple_c(events): =20 @for_backend("stderr", "h", "Stderr built-in backend") def stderr_h(events): - print '''#include -#include "trace/stderr.h" - -extern TraceEvent trace_list[];''' + print """\ +#include +#include "trace/control.h" +""" =20 for num, event in enumerate(events): argnames =3D ", ".join(event.args.names()) @@ -360,31 +360,21 @@ extern TraceEvent trace_list[];''' print ''' static inline void trace_%(name)s(%(args)s) { - if (trace_list[%(event_num)s].state !=3D 0) { + bool _state =3D trace_event_get_state(%(event_id)s); + if (_state) { fprintf(stderr, "%(name)s " %(fmt)s "\\n" %(argnames)s); } }''' % { 'name': event.name, 'args': event.args, - 'event_num': num, + 'event_id': "TRACE_" + event.name.upper(), 'fmt': event.fmt.rstrip('\n'), 'argnames': argnames } - print - print '#define NR_TRACE_EVENTS %d' % len(events) =20 @for_backend("stderr", "c") def stderr_c(events): - print '''#include "trace.h" - -TraceEvent trace_list[] =3D { -''' - for event in events: - print '{.tp_name =3D "%(name)s", .state=3D0},' % { - 'name': event.name -} - print - print '};' + pass =20 =20 ################################################## diff --git a/trace/stderr.c b/trace/stderr.c index 0810d6f..6685aeb 100644 --- a/trace/stderr.c +++ b/trace/stderr.c @@ -4,40 +4,18 @@ =20 void trace_print_events(FILE *stream, fprintf_function stream_printf) { - unsigned int i; + TraceEventID 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; + ev->dstate =3D state; } =20 bool trace_backend_init(const char *events, const char *file)