From patchwork Tue Jun 12 09:47:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 164360 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 537F6B6FA1 for ; Tue, 12 Jun 2012 19:47:47 +1000 (EST) Received: from localhost ([::1]:35600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNhR-0007mH-6A for incoming@patchwork.ozlabs.org; Tue, 12 Jun 2012 05:47:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNhA-0007OA-JT for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:47:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SeNh8-0004qH-2v for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:47:28 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:47367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SeNh7-0004pG-O2 for qemu-devel@nongnu.org; Tue, 12 Jun 2012 05:47:26 -0400 Received: from gw.ac.upc.edu (gw.ac.upc.es [147.83.30.3]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id q5C9lNvg030373; Tue, 12 Jun 2012 11:47:23 +0200 Received: from localhost (unknown [132.68.49.201]) by gw.ac.upc.edu (Postfix) with ESMTP id 0F1AC2D003D; Tue, 12 Jun 2012 11:47:21 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Tue, 12 Jun 2012 12:47:21 +0300 Message-Id: <20120612094720.24441.93496.stgit@fimbulvetr.bsc.es> X-Mailer: git-send-email 1.7.10 In-Reply-To: <20120612094705.24441.7950.stgit@fimbulvetr.bsc.es> References: <20120612094705.24441.7950.stgit@fimbulvetr.bsc.es> User-Agent: StGit/0.16 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id q5C9lNvg030373 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.33.10 Cc: Blue Swirl , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v5 2/7] trace: Provide a generic tracing event descriptor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Uses tracetool to generate a backend-independent tracing event description (struct TraceEvent). The values for such structure are generated with the non-public "events" backend ("events-c" frontend). The generation of the defines to check if an event is statically enabled is also moved to the "events" backend ("events-h" frontend). Signed-off-by: Lluís Vilanova --- 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 fd68151..182de95 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 74110dd..4184ad7 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -134,6 +134,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 @@ -184,7 +203,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-obj-$(CONFIG_TRACE_DEFAULT) += trace/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 " +__copyright__ = "Copyright 2012, Lluís Vilanova " +__license__ = "GPL version 2 or (at your option) any later version" + +__maintainer__ = "Stefan Hajnoczi" +__email__ = "stefanha@linux.vnet.ibm.com" + + +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 " +__copyright__ = "Copyright 2012, Lluís Vilanova " +__license__ = "GPL version 2 or (at your option) any later version" + +__maintainer__ = "Stefan Hajnoczi" +__email__ = "stefanha@linux.vnet.ibm.com" + + +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 " +__copyright__ = "Copyright 2012, Lluís Vilanova " +__license__ = "GPL version 2 or (at your option) any later version" + +__maintainer__ = "Stefan Hajnoczi" +__email__ = "stefanha@linux.vnet.ibm.com" + + +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 ', + '' + ) + + # 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 + * + * 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 */