[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 2/7] trace: Provide a generic tracing event descr
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v4 2/7] trace: Provide a generic tracing event descriptor |
Date: |
Tue, 8 May 2012 16:38:26 +0200 |
User-agent: |
StGit/0.16 |
Uses tracetool to generate a backend-independent tracing event description.
Signed-off-by: Lluís Vilanova <address@hidden>
---
Makefile | 5 +++
Makefile.objs | 21 ++++++++++++++
scripts/tracetool/backend/events.py | 23 ++++++++++++++++
scripts/tracetool/format/events_c.py | 39 +++++++++++++++++++++++++++
scripts/tracetool/format/events_h.py | 50 ++++++++++++++++++++++++++++++++++
scripts/tracetool/format/h.py | 9 +-----
trace/event-internal.h | 33 ++++++++++++++++++++++
7 files changed, 171 insertions(+), 9 deletions(-)
create mode 100644 scripts/tracetool/backend/events.py
create mode 100644 scripts/tracetool/format/events_c.py
create mode 100644 scripts/tracetool/format/events_h.py
create mode 100644 trace/event-internal.h
diff --git a/Makefile b/Makefile
index 5829611..36b97d5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,9 +19,14 @@ config-host.mak:
endif
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
+
+GENERATED_HEADERS += trace-events.h
+GENERATED_SOURCES += trace-events.c
+
ifeq ($(TRACE_BACKEND),dtrace)
GENERATED_HEADERS += trace-dtrace.h
endif
+
GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c trace.c
diff --git a/Makefile.objs b/Makefile.objs
index 70c5c79..c17c231 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -372,6 +372,25 @@ libdis-$(CONFIG_LM32_DIS) += lm32-dis.o
######################################################################
# trace
+trace-events.h: trace-events.h-timestamp
+trace-events.h-timestamp: $(SRC_PATH)/trace-events
+ $(call quiet-command,$(TRACETOOL) \
+ --format=events-h \
+ --backend=events \
+ < $< > $@," GEN trace-events.h")
+ @cmp -s $@ trace-events.h || cp $@ trace-events.h
+
+trace-events.c: trace-events.c-timestamp
+trace-events.c-timestamp: $(SRC_PATH)/trace-events
+ $(call quiet-command,$(TRACETOOL) \
+ --format=events-c \
+ --backend=events \
+ < $< > $@," GEN trace-events.c")
+ @cmp -s $@ trace-events.c || cp $@ trace-events.c
+
+trace-obj-y += trace-events.o
+
+
ifeq ($(TRACE_BACKEND),dtrace)
TRACE_H_EXTRA_DEPS=trace-dtrace.h
endif
@@ -422,7 +441,7 @@ trace/simple.o: trace/simple.c $(GENERATED_HEADERS)
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
ifneq ($(TRACE_BACKEND),dtrace)
-trace-obj-y = trace.o
+trace-obj-y += trace.o
endif
trace-nested-$(CONFIG_TRACE_DEFAULT) += default.o
diff --git a/scripts/tracetool/backend/events.py
b/scripts/tracetool/backend/events.py
new file mode 100644
index 0000000..5afce3e
--- /dev/null
+++ b/scripts/tracetool/backend/events.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generic event description.
+
+This is a dummy backend to establish appropriate frontend/backend compatibility
+checks.
+"""
+
+__author__ = "Lluís Vilanova <address@hidden>"
+__copyright__ = "Copyright 2012, Lluís Vilanova <address@hidden>"
+__license__ = "GPL version 2 or (at your option) any later version"
+
+__maintainer__ = "Stefan Hajnoczi"
+__email__ = "address@hidden"
+
+
+def events_h(events):
+ pass
+
+def events_c(events):
+ pass
diff --git a/scripts/tracetool/format/events_c.py
b/scripts/tracetool/format/events_c.py
new file mode 100644
index 0000000..f395e82
--- /dev/null
+++ b/scripts/tracetool/format/events_c.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generate .c for event description.
+"""
+
+__author__ = "Lluís Vilanova <address@hidden>"
+__copyright__ = "Copyright 2012, Lluís Vilanova <address@hidden>"
+__license__ = "GPL version 2 or (at your option) any later version"
+
+__maintainer__ = "Stefan Hajnoczi"
+__email__ = "address@hidden"
+
+
+from tracetool import out
+
+
+def begin(events):
+ out('/* This file is autogenerated by tracetool, do not edit. */',
+ '',
+ '#include "trace.h"',
+ '#include "trace-events.h"',
+ '#include "trace/control.h"',
+ '',
+ )
+
+ out('TraceEvent trace_events[TRACE_EVENT_COUNT] = {')
+
+ for e in events:
+ out(' { .id = %(id)s, .name = \"%(name)s\", .sstate = %(sstate)s,
.dstate = 0 },',
+ id = "TRACE_" + e.name.upper(),
+ name = e.name,
+ sstate = "TRACE_%s_ENABLED" % e.name.upper(),
+ )
+
+ out('};',
+ '',
+ )
diff --git a/scripts/tracetool/format/events_h.py
b/scripts/tracetool/format/events_h.py
new file mode 100644
index 0000000..643a119
--- /dev/null
+++ b/scripts/tracetool/format/events_h.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generate .h for event description.
+"""
+
+__author__ = "Lluís Vilanova <address@hidden>"
+__copyright__ = "Copyright 2012, Lluís Vilanova <address@hidden>"
+__license__ = "GPL version 2 or (at your option) any later version"
+
+__maintainer__ = "Stefan Hajnoczi"
+__email__ = "address@hidden"
+
+
+from tracetool import out
+
+
+def begin(events):
+ out('/* This file is autogenerated by tracetool, do not edit. */',
+ '',
+ '#ifndef TRACE_EVENTS_H',
+ '#define TRACE_EVENTS_H',
+ '',
+ '#include <stdbool.h>',
+ ''
+ )
+
+ # event identifiers
+ out('typedef enum {')
+
+ for e in events:
+ out(' TRACE_%s,' % e.name.upper())
+
+ out(' TRACE_EVENT_COUNT',
+ '} TraceEventID;',
+ )
+
+ # static state
+ for e in events:
+ if 'disable' in e.properties:
+ enabled = 0
+ else:
+ enabled = 1
+ out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
+
+ out('#include "trace/event-internal.h"',
+ '',
+ '#endif /* TRACE_EVENTS_H */',
+ )
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index 6ffb3c2..80a1a05 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -25,14 +25,7 @@ def begin(events):
'#include "qemu-common.h"')
def end(events):
- for e in events:
- if "disable" in e.properties:
- enabled = 0
- else:
- enabled = 1
- out('#define TRACE_%s_ENABLED %d' % (e.name.upper(), enabled))
- out('',
- '#endif /* TRACE_H */')
+ out('#endif /* TRACE_H */')
def nop(events):
for e in events:
diff --git a/trace/event-internal.h b/trace/event-internal.h
new file mode 100644
index 0000000..a26c57f
--- /dev/null
+++ b/trace/event-internal.h
@@ -0,0 +1,33 @@
+/*
+ * Interface for configuring and controlling the state of tracing events.
+ *
+ * Copyright (C) 2012 Lluís Vilanova <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef TRACE__EVENT_H
+#define TRACE__EVENT_H
+
+#include "trace-events.h"
+
+
+/**
+ * TraceEvent:
+ * @id: Unique event identifier.
+ * @name: Event name.
+ * @sstate: Static instrumentation state.
+ * @dstate: Dynamic instrumentation state.
+ *
+ * Opaque generic description of a tracing event.
+ */
+typedef struct TraceEvent {
+ TraceEventID id;
+ const char * name;
+ const bool sstate;
+ bool dstate;
+} TraceEvent;
+
+
+#endif /* TRACE__EVENT_H */
- [Qemu-devel] [PATCH v4 0/7] trace: Generic event state description, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 1/7] tracetool: Explicitly identify public backends, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 2/7] trace: Provide a generic tracing event descriptor,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v4 3/7] trace: Provide a detailed event control interface, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 4/7] trace: [monitor] Use new event control interface, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 5/7] trace: [default] Use new event control interface, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 6/7] trace: [simple] Port to generic event information and new control interface, Lluís Vilanova, 2012/05/08
- [Qemu-devel] [PATCH v4 7/7] trace: [stderr] Port to generic event information and new control interface, Lluís Vilanova, 2012/05/08