@@ -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];'
@for_backend("simple", "c")
def simple_c(events):
rec_off = 0
- print '#include "trace.h"'
- print '#include "trace/simple.h"'
- print
- print 'TraceEvent trace_list[] = {'
- print
- for event in events:
- print '{.tp_name = "%(name)s", .state=0},' % {
- 'name': event.name
-}
- print
- print '};'
- print
+ print """\
+#include "trace.h"
+#include "trace/control.h"
+#include "trace/simple.h"
+"""
- for num, event in enumerate(events):
- sizes = []
+ for event in events:
+ sizes = ["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));
- if (!trace_list[%(event_id)s].state) {
+ bool _state = trace_event_get_state(%(event_id)s);
+ if (!_state) {
return;
}
@@ -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,
}
@@ -263,38 +263,17 @@ 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(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;
+ assert(ev != NULL);
+ ev->dstate = state;
}
/* Helper function to create a thread with signals blocked. Use glib's
@@ -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 st_print_trace(FILE *stream, fprintf_function stream_printf);
void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf);
deleted file mode 100644
@@ -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 */
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> --- 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