sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-22 12:58:36 +00:00
Code Issues Releases Wiki Activity

trace_cmd: handle trace headers and thread names with spaces

Browse Source
This commit is contained in:
Sergei Trofimov 2015-08-17 12:37:58 +01:00
parent 25c0fd7b8b
commit 95c3f049fb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wlauto/utils/trace_cmd.py
View File

@ -173,9 +173,11 @@ def regex_body_parser(regex, flags=0):
EVENT_PARSER_MAP = { EVENT_PARSER_MAP = {
} }
TRACE_EVENT_REGEX = re.compile(r'^\s+(?P<thread>\S+)\s+\[(?P<cpu_id>\d+)\]\s+(?P<ts>[\d.]+):\s+' 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*$') r'(?P<name>[^:]+):\s+(?P<body>.*?)\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\]')
@ -217,6 +219,11 @@ class TraceCmdTrace(object):
yield DroppedEventsEvent(match.group('cpu_id')) yield DroppedEventsEvent(match.group('cpu_id'))
continue continue
match = HEADER_REGEX.search(line)
if match:
logger.debug(line.strip())
continue
match = TRACE_EVENT_REGEX.search(line) match = TRACE_EVENT_REGEX.search(line)
if not match: if not match:
logger.warning('Invalid trace event: "{}"'.format(line)) logger.warning('Invalid trace event: "{}"'.format(line))