Chromium Code Reviews| Index: tools/telemetry/telemetry/timeline/trace_event_importer.py |
| diff --git a/tools/telemetry/telemetry/timeline/trace_event_importer.py b/tools/telemetry/telemetry/timeline/trace_event_importer.py |
| index 111e241fd1539a6027ed4daa835f69fd244c609f..3a86a47a1d9f92440bcf5aa827ca45125128b15c 100644 |
| --- a/tools/telemetry/telemetry/timeline/trace_event_importer.py |
| +++ b/tools/telemetry/telemetry/timeline/trace_event_importer.py |
| @@ -194,16 +194,27 @@ class TraceEventTimelineImporter(importer.TimelineImporter): |
| 'event': event, |
| 'thread': thread}) |
| - def _ProcessMemoryDumpEvent(self, event): |
| - process = self._GetOrCreateProcess(event['pid']) |
| - memory_dump = memory_dump_event.ProcessMemoryDumpEvent(process, event) |
| - process.AddMemoryDumpEvent(memory_dump) |
| - self._all_memory_dumps_by_dump_id[memory_dump.dump_id].append(memory_dump) |
| + def _ProcessMemoryDumpEvents(self, events): |
| + # Dictionary to order dumps by id and process. |
| + global_dumps = collections.defaultdict(dict) |
| + for event in events: |
| + process = self._GetOrCreateProcess(event['pid']) |
| + if process not in global_dumps[event['id']]: |
| + global_dumps[event['id']][ |
|
petrcermak
2016/01/07 18:59:29
this might look a bit better as follows:
global_d
|
| + process] = memory_dump_event.ProcessMemoryDumpEvent( |
| + process, event['id'], event['ts']) |
| + global_dumps[event['id']][process].AddRawEvent(event) |
| + for dump_id, global_dump in global_dumps.iteritems(): |
| + for process, process_dump in global_dump.iteritems(): |
| + process_dump.ProcessAllocatorDumps() |
| + process.AddMemoryDumpEvent(process_dump) |
| + self._all_memory_dumps_by_dump_id[dump_id].append(process_dump) |
| def ImportEvents(self): |
| """Walks through the events_ list and outputs the structures discovered to |
| model_. |
| """ |
| + memory_dump_events = [] |
| for event in self._events: |
| phase = event.get('ph', None) |
| if phase == 'B' or phase == 'E': |
| @@ -231,13 +242,16 @@ class TraceEventTimelineImporter(importer.TimelineImporter): |
| elif phase == 's' or phase == 't' or phase == 'f': |
| self._ProcessFlowEvent(event) |
| elif phase == 'v': |
| - self._ProcessMemoryDumpEvent(event) |
| + memory_dump_events.append(event) |
| elif phase == 'R': |
| self._ProcessMarkEvent(event) |
| else: |
| self._model.import_errors.append('Unrecognized event phase: ' + |
| phase + '(' + event['name'] + ')') |
| + # Memory dumps of a process with the same dump id need to be merged before |
| + # processing. So, memory dump events are processed all at once. |
| + self._ProcessMemoryDumpEvents(memory_dump_events) |
| return self._model |
| def FinalizeImport(self): |