[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] trace: Relax trace-events parsing regex in simp
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 1/3] trace: Relax trace-events parsing regex in simpletrace.py |
Date: |
Mon, 18 Oct 2010 13:42:54 +0100 |
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 <address@hidden>
---
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
--
1.7.1