[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/18] trace: [tcg] Generate TCG tracing routines
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 13/18] trace: [tcg] Generate TCG tracing routines |
Date: |
Tue, 12 Aug 2014 14:37:50 +0100 |
From: Lluís Vilanova <address@hidden>
Generate header "trace/generated-tcg-tracers.h" with the necessary routines for
tracing events in guest code:
* trace_${event}_tcg
Convenience wrapper that calls the translation-time tracer
'trace_${event}_trans', and calls 'gen_helper_trace_${event}_exec to
generate the TCG code to later trace the event at execution time.
Signed-off-by: Lluís Vilanova <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
.gitignore | 1 +
Makefile | 2 ++
include/trace-tcg.h | 7 +++++
scripts/tracetool/format/tcg_h.py | 57 +++++++++++++++++++++++++++++++++++++++
trace/Makefile.objs | 9 +++++++
5 files changed, 76 insertions(+)
create mode 100644 include/trace-tcg.h
create mode 100644 scripts/tracetool/format/tcg_h.py
diff --git a/.gitignore b/.gitignore
index 6631c57..e32a584 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
/trace/generated-helpers-wrappers.h
/trace/generated-helpers.h
/trace/generated-helpers.c
+/trace/generated-tcg-tracers.h
/trace/generated-ust-provider.h
/trace/generated-ust.c
/libcacard/trace/generated-tracers.c
diff --git a/Makefile b/Makefile
index fa93fc9..20b697e 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,8 @@ GENERATED_HEADERS += trace/generated-tracers-dtrace.h
endif
GENERATED_SOURCES += trace/generated-tracers.c
+GENERATED_HEADERS += trace/generated-tcg-tracers.h
+
GENERATED_HEADERS += trace/generated-helpers-wrappers.h
GENERATED_HEADERS += trace/generated-helpers.h
GENERATED_SOURCES += trace/generated-helpers.c
diff --git a/include/trace-tcg.h b/include/trace-tcg.h
new file mode 100644
index 0000000..6f6bdbb
--- /dev/null
+++ b/include/trace-tcg.h
@@ -0,0 +1,7 @@
+#ifndef TRACE_TCG_H
+#define TRACE_TCG_H
+
+#include "trace/generated-tcg-tracers.h"
+#include "trace/generated-events.h"
+
+#endif /* TRACE_TCG_H */
diff --git a/scripts/tracetool/format/tcg_h.py
b/scripts/tracetool/format/tcg_h.py
new file mode 100644
index 0000000..f676b66
--- /dev/null
+++ b/scripts/tracetool/format/tcg_h.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+Generate .h file for TCG code generation.
+"""
+
+__author__ = "Lluís Vilanova <address@hidden>"
+__copyright__ = "Copyright 2012-2014, 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 generate(events, backend):
+ out('/* This file is autogenerated by tracetool, do not edit. */',
+ '/* You must include this file after the inclusion of helper.h */',
+ '',
+ '#ifndef TRACE__GENERATED_TCG_TRACERS_H',
+ '#define TRACE__GENERATED_TCG_TRACERS_H',
+ '',
+ '#include <stdint.h>',
+ '',
+ '#include "trace.h"',
+ '#include "exec/helper-proto.h"',
+ '',
+ )
+
+ for e in events:
+ # just keep one of them
+ if "tcg-trans" not in e.properties:
+ continue
+
+ # get the original event definition
+ e = e.original.original
+
+ out('static inline void %(name_tcg)s(%(args)s)',
+ '{',
+ name_tcg=e.api(e.QEMU_TRACE_TCG),
+ args=e.args)
+
+ if "disable" not in e.properties:
+ out(' %(name_trans)s(%(argnames_trans)s);',
+ ' gen_helper_%(name_exec)s(%(argnames_exec)s);',
+ name_trans=e.event_trans.api(e.QEMU_TRACE),
+ name_exec=e.event_exec.api(e.QEMU_TRACE),
+ argnames_trans=", ".join(e.event_trans.args.names()),
+ argnames_exec=", ".join(e.event_exec.args.names()))
+
+ out('}')
+
+ out('',
+ '#endif /* TRACE__GENERATED_TCG_TRACERS_H */')
diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 72cc3f5..387f191 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -128,6 +128,15 @@ $(obj)/generated-helpers.o: $(obj)/generated-helpers.c
target-obj-y += generated-helpers.o
+$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
+$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events
$(BUILD_DIR)/config-host.mak
+ $(call quiet-command,$(TRACETOOL) \
+ --format=tcg-h \
+ --backend=$(TRACE_BACKENDS) \
+ < $< > $@," GEN $(patsubst %-timestamp,%,$@)")
+ @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst
%-timestamp,%,$@)
+
+
######################################################################
# Backend code
--
1.9.3
- [Qemu-devel] [PULL 04/18] trace: install simpletrace SystemTap tapset, (continued)
- [Qemu-devel] [PULL 04/18] trace: install simpletrace SystemTap tapset, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 03/18] simpletrace: add simpletrace.py --no-header option, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 06/18] trace: [tcg] Argument type transformation rules, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 05/18] trace: [tcg] Add documentation, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 07/18] trace: [tcg] Argument type transformation machinery, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 08/18] trace: [tcg] Add 'tcg' event property, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 10/18] trace: [tcg] Define TCG tracing helper routines, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 09/18] trace: [tcg] Declare TCG tracing helper routines, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 11/18] trace: [tcg] Define TCG tracing helper routine wrappers, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 12/18] trace: [tcg] Include TCG-tracing helpers, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 13/18] trace: [tcg] Generate TCG tracing routines,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 14/18] trace: [tcg] Include event definitions in "trace.h", Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 16/18] trace: teach lttng backend to use format strings, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 15/18] trace: [tcg] Include TCG-tracing header on all targets, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 17/18] trace: add some tcg tracing support, Stefan Hajnoczi, 2014/08/12
- [Qemu-devel] [PULL 18/18] virtio-rng: add some trace events, Stefan Hajnoczi, 2014/08/12
- Re: [Qemu-devel] [PULL 00/18] Tracing patches, Peter Maydell, 2014/08/15