From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxh4T-0007O1-VT for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:47:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rxh4G-0004jF-LQ for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:47:05 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:52528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rxh4F-0004ic-Sj for qemu-devel@nongnu.org; Wed, 15 Feb 2012 10:46:52 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Feb 2012 21:16:40 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q1FFkVjK3301602 for ; Wed, 15 Feb 2012 21:16:32 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q1FFkT1r024983 for ; Thu, 16 Feb 2012 02:46:31 +1100 From: Harsh Prateek Bora Date: Wed, 15 Feb 2012 21:16:17 +0530 Message-Id: <1329320783-6365-9-git-send-email-harsh@linux.vnet.ibm.com> In-Reply-To: <1329320783-6365-1-git-send-email-harsh@linux.vnet.ibm.com> References: <1329320783-6365-1-git-send-email-harsh@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [RFC PATCH v4 08/14] trace: [tracetool] Make format-specific code optional with access to events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com, vilanova@ac.upc.edu, aneesh.kumar@linux.vnet.ibm.com From: Lluís Vilanova Signed-off-by: Lluís Vilanova Signed-off-by: Harsh Prateek Bora --- scripts/tracetool.py | 32 ++++++++++---------------------- 1 files changed, 10 insertions(+), 22 deletions(-) diff --git a/scripts/tracetool.py b/scripts/tracetool.py index 986dc4d..2d6f9ee 100755 --- a/scripts/tracetool.py +++ b/scripts/tracetool.py @@ -39,7 +39,7 @@ Options: ''' sys.exit(1) -def trace_h_begin(): +def trace_h_begin(events): print '''#ifndef TRACE_H #define TRACE_H @@ -47,17 +47,12 @@ def trace_h_begin(): #include "qemu-common.h"''' - -def trace_h_end(): +def trace_h_end(events): print '#endif /* TRACE_H */' - -def trace_c_begin(): +def trace_c_begin(events): print '/* This file is autogenerated by tracetool, do not edit. */' -def trace_c_end(): - pass # nop, required for trace_gen - def nop_h(events): print for event in events: @@ -284,18 +279,12 @@ 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): print '/* This file is autogenerated by tracetool, do not edit. */' -def trace_stap_end(): - pass #nop, reqd for trace_gen - -def trace_d_begin(): +def trace_d_begin(events): print '/* This file is autogenerated by tracetool, do not edit. */' -def trace_d_end(): - pass #nop, reqd for trace_gen - # Registry of backends and their converter functions converters = { @@ -331,22 +320,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, }, } @@ -496,10 +482,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() -- 1.7.1.1