From patchwork Fri Feb 10 11:49:33 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: 140590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB81DB6F98 for ; Fri, 10 Feb 2012 23:08:36 +1100 (EST) Received: from localhost ([::1]:53457 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RvpHD-00062J-Jo for incoming@patchwork.ozlabs.org; Fri, 10 Feb 2012 07:08:31 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvoz7-0005Z2-4K for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:49:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvoz0-0001h5-V9 for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:49:48 -0500 Received: from gw.ac.upc.edu ([147.83.30.3]:55467) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvoz0-0001gl-Hv for qemu-devel@nongnu.org; Fri, 10 Feb 2012 06:49:42 -0500 Received: from localhost (unknown [10.8.0.22]) by gw.ac.upc.edu (Postfix) with ESMTP id 9F5532D000D; Fri, 10 Feb 2012 12:49:41 +0100 (CET) To: qemu-devel@nongnu.org From: =?utf-8?b?TGx1w61z?= Vilanova Date: Fri, 10 Feb 2012 12:49:33 +0100 Message-ID: <20120210114933.5104.30071.stgit@ginnungagap.bsc.es> In-Reply-To: <20120210114849.5104.63589.stgit@ginnungagap.bsc.es> References: <20120210114849.5104.63589.stgit@ginnungagap.bsc.es> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 147.83.30.3 Cc: stefanha@gmail.com, harsh@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v3 08/11] trace: [tracetool] Make format-specific code optional and with access to event information 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 Signed-off-by: Lluís Vilanova --- scripts/tracetool.py | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index cd1c29d..91e7620 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -38,26 +38,19 @@ Options: ''' sys.exit(1) -def trace_h_begin(): +def trace_h_begin(events): print '''#ifndef TRACE_H #define TRACE_H /* This file is autogenerated by tracetool, do not edit. */ #include "qemu-common.h"''' - return -def trace_h_end(): +def trace_h_end(events): print '#endif /* TRACE_H */' - return -def trace_c_begin(): +def trace_c_begin(events): print '/* This file is autogenerated by tracetool, do not edit. */' - return - -def trace_c_end(): - # nop, required for trace_gen - return def nop_h(events): print @@ -350,7 +343,7 @@ probe %(probeprefix)s.%(name)s = process("%(binary)s").mark("%(name)s") def dtrace_nop_stp(events): pass -def trace_stap_begin(): +def trace_stap_begin(events): global probeprefix if backend != "dtrace": print 'SystemTAP tapset generator not applicable to %s backend' % backend @@ -367,20 +360,13 @@ def trace_stap_begin(): if probeprefix == "": probeprefix = 'qemu.' + targettype + '.' + targetarch print '/* This file is autogenerated by tracetool, do not edit. */' - return -def trace_stap_end(): - return #nop, reqd for trace_gen - -def trace_d_begin(): +def trace_d_begin(events): if backend != 'dtrace': print 'DTrace probe generator not applicable to %s backend' % backend sys.exit(1) print '/* This file is autogenerated by tracetool, do not edit. */' -def trace_d_end(): - return #nop, reqd for trace_gen - # Registry of backends and their converter functions converters = { @@ -416,22 +402,19 @@ converters = { } # Trace file header and footer code generators -trace_gen = { +formats = { 'h': { 'begin': trace_h_begin, 'end': trace_h_end, }, 'c': { 'begin': trace_c_begin, - 'end': trace_c_end, }, 'd': { 'begin': trace_d_begin, - 'end': trace_d_end, }, 'stap': { 'begin': trace_stap_begin, - 'end': trace_stap_end, }, } @@ -564,10 +547,12 @@ def main(): events = read_events(sys.stdin) - trace_gen[output]['begin']() + if 'begin' in formats[output]: + formats[output]['begin'](events) converters[backend][output]([ e for e in events if 'disable' not in e.properties ]) converters['nop'][output]([ e for e in events if 'disable' in e.properties ]) - trace_gen[output]['end']() + if 'end' in formats[output]: + formats[output]['end'](events) if __name__ == "__main__": main()