From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHc-0000xm-Lm for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHCHY-00087e-4k for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55786) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHCHX-00087X-TT for qemu-devel@nongnu.org; Tue, 12 Aug 2014 09:38:32 -0400 From: Stefan Hajnoczi Date: Tue, 12 Aug 2014 14:37:50 +0100 Message-Id: <1407850675-11890-14-git-send-email-stefanha@redhat.com> In-Reply-To: <1407850675-11890-1-git-send-email-stefanha@redhat.com> References: <1407850675-11890-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/18] trace: [tcg] Generate TCG tracing routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi From: Llu=C3=ADs Vilanova Generate header "trace/generated-tcg-tracers.h" with the necessary routin= es 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=C3=ADs Vilanova Signed-off-by: Stefan Hajnoczi --- .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 +=3D trace/generated-tracers-dtrace.h endif GENERATED_SOURCES +=3D trace/generated-tracers.c =20 +GENERATED_HEADERS +=3D trace/generated-tcg-tracers.h + GENERATED_HEADERS +=3D trace/generated-helpers-wrappers.h GENERATED_HEADERS +=3D trace/generated-helpers.h GENERATED_SOURCES +=3D 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__ =3D "Llu=C3=ADs Vilanova " +__copyright__ =3D "Copyright 2012-2014, Llu=C3=ADs Vilanova " +__license__ =3D "GPL version 2 or (at your option) any later version" + +__maintainer__ =3D "Stefan Hajnoczi" +__email__ =3D "stefanha@linux.vnet.ibm.com" + + +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 ', + '', + '#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 =3D e.original.original + + out('static inline void %(name_tcg)s(%(args)s)', + '{', + name_tcg=3De.api(e.QEMU_TRACE_TCG), + args=3De.args) + + if "disable" not in e.properties: + out(' %(name_trans)s(%(argnames_trans)s);', + ' gen_helper_%(name_exec)s(%(argnames_exec)s);', + name_trans=3De.event_trans.api(e.QEMU_TRACE), + name_exec=3De.event_exec.api(e.QEMU_TRACE), + argnames_trans=3D", ".join(e.event_trans.args.names()), + argnames_exec=3D", ".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 +=3D generated-helpers.o =20 =20 +$(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp +$(obj)/generated-tcg-tracers.h-timestamp: $(SRC_PATH)/trace-events $(BUI= LD_DIR)/config-host.mak + $(call quiet-command,$(TRACETOOL) \ + --format=3Dtcg-h \ + --backend=3D$(TRACE_BACKENDS) \ + < $< > $@," GEN $(patsubst %-timestamp,%,$@)") + @cmp -s $@ $(patsubst %-timestamp,%,$@) || cp $@ $(patsubst %-timestamp= ,%,$@) + + ###################################################################### # Backend code =20 --=20 1.9.3