[Qemu-devel] [PATCH v5 6/7] trace: [simple] Port to generic event information and new control interface

[Lluís Vilanova]

Signed-off-by: Lluís Vilanova <address@hidden>
---
 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 <stdbool.h>
 #include <stdio.h>
 
-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 */