From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCqV-0004JW-3D for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULCqO-0008CH-0y for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULCqN-0008C7-Mp for qemu-devel@nongnu.org; Thu, 28 Mar 2013 09:26:15 -0400 From: Stefan Hajnoczi Date: Thu, 28 Mar 2013 14:25:48 +0100 Message-Id: <1364477152-26994-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1364477152-26994-1-git-send-email-stefanha@redhat.com> References: <1364477152-26994-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 07/11] 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: Anthony Liguori , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova Signed-off-by: Llu=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- scripts/tracetool/backend/stderr.py | 27 ++++++++------------------- trace/stderr.c | 34 ++++++-------------------------= --- trace/stderr.h | 11 ----------- 3 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 trace/stderr.h diff --git a/scripts/tracetool/backend/stderr.py b/scripts/tracetool/back= end/stderr.py index a10fbb8..6f93dbd 100644 --- a/scripts/tracetool/backend/stderr.py +++ b/scripts/tracetool/backend/stderr.py @@ -20,40 +20,29 @@ PUBLIC =3D True =20 =20 def c(events): - out('#include "trace.h"', - '', - 'TraceEvent trace_list[] =3D {') - - for e in events: - out('{.tp_name =3D "%(name)s", .state=3D0},', - name =3D e.name, - ) - - out('};') + pass =20 def h(events): out('#include ', - '#include "trace/stderr.h"', + '#include "trace/control.h"', '', - 'extern TraceEvent trace_list[];') + ) =20 - for num, e in enumerate(events): + for e in events: argnames =3D ", ".join(e.args.names()) if len(e.args) > 0: argnames =3D ", " + argnames =20 out('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" %(argname= s)s);', ' }', '}', name =3D e.name, args =3D e.args, - event_num =3D num, - fmt =3D e.fmt, + event_id =3D "TRACE_" + e.name.upper(), + fmt =3D e.fmt.rstrip("\n"), argnames =3D argnames, ) - - out('', - '#define NR_TRACE_EVENTS %d' % len(events)) diff --git a/trace/stderr.c b/trace/stderr.c index 0810d6f..e212efd 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_backend(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) 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 */ --=20 1.8.1.4