@@ -348,10 +348,10 @@ def simple_c(events):
@for_backend("stderr", "h", "Stderr built-in backend")
def stderr_h(events):
- print '''#include <stdio.h>
-#include "trace/stderr.h"
-
-extern TraceEvent trace_list[];'''
+ print """\
+#include <stdio.h>
+#include "trace/control.h"
+"""
for num, event in enumerate(events):
argnames = ", ".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 != 0) {
+ bool _state = 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)
@for_backend("stderr", "c")
def stderr_c(events):
- print '''#include "trace.h"
-
-TraceEvent trace_list[] = {
-'''
- for event in events:
- print '{.tp_name = "%(name)s", .state=0},' % {
- 'name': event.name
-}
- print
- print '};'
+ pass
##################################################
@@ -4,40 +4,19 @@
void trace_print_events(FILE *stream, fprintf_function stream_printf)
{
- unsigned int i;
+ TraceEventID 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;
}
bool trace_backend_init(const char *events, const char *file)
Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu> --- scripts/tracetool.py | 26 ++++++++------------------ trace/stderr.c | 35 +++++++---------------------------- 2 files changed, 15 insertions(+), 46 deletions(-)