diff options
| author | Javi Merino <javi.merino@arm.com> | 2016-06-20 10:56:26 +0100 |
|---|---|---|
| committer | Javi Merino <javi.merino@arm.com> | 2016-06-20 10:56:26 +0100 |
| commit | fd3506b6c8ff1189fd980823a41391d5bfbbfd32 (patch) | |
| tree | 8f4eb48ea35005494b5973c232c73ddd83f7178d /trappy | |
| parent | 35e40457aa97167d333835c796d77b7404014b83 (diff) | |
| parent | 459dadaf28d43f4c06c0587ff3193732b5bca1f5 (diff) | |
| download | trappy-fd3506b6c8ff1189fd980823a41391d5bfbbfd32.tar.gz | |
Merge "systrace: support legacy systrace format" from Leo Yan
This is PR #200 with some minor typo fixes.
Diffstat (limited to 'trappy')
| -rw-r--r-- | trappy/systrace.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/trappy/systrace.py b/trappy/systrace.py index 5c99ff7..9800ade 100644 --- a/trappy/systrace.py +++ b/trappy/systrace.py @@ -30,10 +30,12 @@ the trace def __call__(self, line): if self.before_begin_trace: - if line.startswith("<!-- BEGIN TRACE -->"): + if line.startswith("<!-- BEGIN TRACE -->") or \ + line.startswith("<title>Android System Trace</title>"): self.before_begin_trace = False elif self.before_script_trace_data: - if line.startswith(' <script class="trace-data"'): + if line.startswith(' <script class="trace-data"') or \ + line.startswith(" var linuxPerfData"): self.before_script_trace_data = False elif not line.startswith("#"): self.before_actual_trace = False |