sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-04-20 09:40:50 +01:00
Code Issues Releases Wiki Activity

utils/trace_cmd: optimize event parsing

Browse Source 
Use string searching and splitting instead of regex matching to parse
trace events. This significantly speeds up trace parsing.
This commit is contained in:
Sergei Trofimov 2017-07-20 10:55:38 +01:00
parent 6f629601be
commit 93dba8b35d
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wlauto/utils/trace_cmd.py
View File

@ -232,9 +232,6 @@ EVENT_PARSER_MAP = {
'sched_wakeup_new': sched_wakeup_parser, 'sched_wakeup_new': sched_wakeup_parser,
} }
TRACE_EVENT_REGEX = re.compile(r'^\s+(?P<thread>\S+.*?\S+)\s+\[(?P<cpu_id>\d+)\]\s+(?P<ts>[\d.]+):\s+'
r'(?P<name>[^:]+):\s+(?P<body>.*?)\s*$')
HEADER_REGEX = re.compile(r'^\s*(?:version|cpus)\s*=\s*([\d.]+)\s*$') HEADER_REGEX = re.compile(r'^\s*(?:version|cpus)\s*=\s*([\d.]+)\s*$')
DROPPED_EVENTS_REGEX = re.compile(r'CPU:(?P<cpu_id>\d+) \[\d*\s*EVENTS DROPPED\]') DROPPED_EVENTS_REGEX = re.compile(r'CPU:(?P<cpu_id>\d+) \[\d*\s*EVENTS DROPPED\]')
@ -292,12 +289,12 @@ class TraceCmdTrace(object):
if matched: if matched:
continue continue
match = TRACE_EVENT_REGEX.search(line) # <thread/cpu/timestamp>: <event name>: <event body>
if not match: parts = line.split(': ', 2)
logger.warning('Invalid trace event: "{}"'.format(line)) if len(parts) != 3:
continue continue
event_name = match.group('name') event_name = parts[1].strip()
if filters: if filters:
found = False found = False
@ -308,10 +305,22 @@ class TraceCmdTrace(object):
if not found: if not found:
continue continue
thread_string, rest = parts[0].split(' [')
cpu_id, ts_string = rest.split('] ')
body = parts[2].strip()
body_parser = EVENT_PARSER_MAP.get(event_name, default_body_parser) body_parser = EVENT_PARSER_MAP.get(event_name, default_body_parser)
if isinstance(body_parser, basestring) or isinstance(body_parser, re._pattern_type): # pylint: disable=protected-access if isinstance(body_parser, basestring) or isinstance(body_parser, re._pattern_type): # pylint: disable=protected-access
body_parser = regex_body_parser(body_parser) body_parser = regex_body_parser(body_parser)
yield TraceCmdEvent(parser=body_parser, **match.groupdict())
yield TraceCmdEvent(
thread=thread_string.strip(),
cpu_id=cpu_id,
ts=ts_string.strip(),
name=event_name,
body=body,
parser=body_parser,
)
else: else:
if self.filter_markers and inside_marked_region: if self.filter_markers and inside_marked_region:
logger.warning('Did not encounter a stop marker in trace') logger.warning('Did not encounter a stop marker in trace')