From patchwork Tue Jun 12 09:47:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 164366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 92648B6FAC for ; Tue, 12 Jun 2012 20:08:42 +1000 (EST) Received: from localhost ([::1]:38399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNhr-0000pd-2Y for incoming@patchwork.ozlabs.org; Tue, 12 Jun 2012 05:48:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNhg-0000YR-Kv for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:48:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeNhc-00052e-9o for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:48:00 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:47383) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNhb-000520-VI for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:47:56 -0400 Received: from gw.ac.upc.edu (gw.ac.upc.es [147.83.30.3]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id q5C9lrFY030404; Tue, 12 Jun 2012 11:47:53 +0200 Received: from localhost (unknown [132.68.49.201]) by gw.ac.upc.edu (Postfix) with ESMTP id 3F8402D003D; Tue, 12 Jun 2012 11:47:52 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Tue, 12 Jun 2012 12:47:50 +0300 Message-Id: <20120612094750.24441.70104.stgit@fimbulvetr.bsc.es> X-Mailer: git-send-email 1.7.10 In-Reply-To: <20120612094705.24441.7950.stgit@fimbulvetr.bsc.es> References: <20120612094705.24441.7950.stgit@fimbulvetr.bsc.es> User-Agent: StGit/0.16 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id q5C9lrFY030404 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.33.10 Cc: Blue Swirl , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v5 6/7] trace: [simple] Port to generic event information and new control interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Lluís Vilanova --- scripts/tracetool/backend/simple.py | 12 +----------- trace/simple.c | 36 ++++++++--------------------------- trace/simple.h | 6 +----- trace/stderr.h | 11 ----------- 4 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 trace/stderr.h diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py index 9a4f512..eca17c6 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -22,14 +22,7 @@ PUBLIC = True def c(events): out('#include "trace.h"', '', - 'TraceEvent trace_list[] = {') - - for e in events: - out('{.tp_name = "%(name)s", .state=0},', - name = e.name, - ) - - out('};') + ) def h(events): out('#include "trace/simple.h"', @@ -53,6 +46,3 @@ def h(events): argc = len(e.args), trace_args = simple_args, ) - - out('#define NR_TRACE_EVENTS %d' % len(events)) - out('extern TraceEvent trace_list[NR_TRACE_EVENTS];') diff --git a/trace/simple.c b/trace/simple.c index 33ae486..1fd8b0e 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -156,7 +156,9 @@ static void trace(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, unsigned int idx; uint64_t timestamp; - if (!trace_list[event].state) { + TraceEvent *eventp = trace_event_id(event); + bool _state = trace_event_get_state_dynamic(eventp); + if (!_state) { return; } @@ -315,38 +317,16 @@ void trace_print_events(FILE *stream, fprintf_function stream_printf) { unsigned int i; - for (i = 0; i < NR_TRACE_EVENTS; i++) { + for (i = 0; i < trace_event_count(); i++) { + TraceEvent *ev = 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)); } } -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 = 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 matched; + ev->dstate = state; } /* Helper function to create a thread with signals blocked. Use glib's diff --git a/trace/simple.h b/trace/simple.h index 466e75b..059752b 100644 --- a/trace/simple.h +++ b/trace/simple.h @@ -15,12 +15,8 @@ #include #include -typedef uint64_t TraceEventID; +#include "trace-events.h" -typedef struct { - const char *tp_name; - bool state; -} TraceEvent; void trace0(TraceEventID event); void trace1(TraceEventID event, uint64_t x1); 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 */