From patchwork Mon Oct 18 12:42:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 68176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5B9CAB70EA for ; Mon, 18 Oct 2010 23:50:25 +1100 (EST) Received: from localhost ([127.0.0.1]:40395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7pAT-0002iJ-Nd for incoming@patchwork.ozlabs.org; Mon, 18 Oct 2010 08:50:21 -0400 Received: from [140.186.70.92] (port=33041 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P7p3j-00062R-UB for qemu-devel@nongnu.org; Mon, 18 Oct 2010 08:43:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P7p3U-0000z9-Dn for qemu-devel@nongnu.org; Mon, 18 Oct 2010 08:43:10 -0400 Received: from mtagate6.uk.ibm.com ([194.196.100.166]:51836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P7p3U-0000yY-5g for qemu-devel@nongnu.org; Mon, 18 Oct 2010 08:43:08 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate6.uk.ibm.com (8.13.1/8.13.1) with ESMTP id o9ICh6Rv008524 for ; Mon, 18 Oct 2010 12:43:06 GMT Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9ICh1lJ3514532 for ; Mon, 18 Oct 2010 13:43:06 +0100 Received: from d06av12.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9ICh13e010702 for ; Mon, 18 Oct 2010 06:43:01 -0600 Received: from stefan-thinkpad.manchester-maybrook.uk.ibm.com (dyn-9-174-219-27.manchester-maybrook.uk.ibm.com [9.174.219.27]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9ICgxxb010662; Mon, 18 Oct 2010 06:43:00 -0600 From: Stefan Hajnoczi To: Blue Swirl Date: Mon, 18 Oct 2010 13:42:54 +0100 Message-Id: <1287405776-19651-2-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 1/3] trace: Relax trace-events parsing regex in simpletrace.py X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The regular expression to parse trace event definitions assumed the format string would be a simple double-quoted string. However, we now use PRI?64 for portability which splits string literals. The regular expression can disregard the format string entirely since simpletrace.py never needs to use it. Signed-off-by: Stefan Hajnoczi --- simpletrace.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simpletrace.py b/simpletrace.py index c2cf168..553a727 100755 --- a/simpletrace.py +++ b/simpletrace.py @@ -19,7 +19,7 @@ header_version = 0 trace_fmt = '=QQQQQQQQ' trace_len = struct.calcsize(trace_fmt) -event_re = re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\)\s+"([^"]*)"') +event_re = re.compile(r'(disable\s+)?([a-zA-Z0-9_]+)\(([^)]*)\).*') def err(msg): sys.stderr.write(msg + '\n') @@ -39,7 +39,7 @@ def parse_events(fobj): if m is None: continue - disable, name, args, fmt = m.groups() + disable, name, args = m.groups() events[event_num] = (name,) + get_argnames(args) event_num += 1 return events