Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: tracing/tracing/extras/importer/linux_perf/ftrace_importer.html

Issue 1319013002: Android event log importer. (Closed) Base URL: https://github.com/catapult-project/catapult.git@master
Patch Set: Removed console.log Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
diff --git a/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html b/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
index 2dbae1aa7b87be38e2d11866894974c7aabbf953..509a102b5bbd589ea366139b9e2b1e44d8eed897 100644
--- a/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
+++ b/tracing/tracing/extras/importer/linux_perf/ftrace_importer.html
@@ -147,6 +147,7 @@ tr.exportTo('tr.e.importer.linux_perf', function() {
var traceEventClockSyncRE = /trace_event_clock_sync: parent_ts=(\d+\.?\d*)/;
TestExports.traceEventClockSyncRE = traceEventClockSyncRE;
+ var realTimeClockSyncRE = /trace_event_clock_sync: realtime_ts=(\d+)/;
var genericClockSyncRE = /trace_event_clock_sync: name=(\w+)/;
// Some kernel trace events are manually classified in slices and
@@ -750,6 +751,13 @@ tr.exportTo('tr.e.importer.linux_perf', function() {
return;
if (traceEventClockSyncRE.exec(eventBase.details))
this.traceClockSyncEvent(eventName, cpuNumber, pid, ts, eventBase);
+ if (realTimeClockSyncRE.exec(eventBase.details)) {
+ // This entry maps realtime to clock_monotonic; store in the model
+ // so that importers parsing files with realtime timestamps can
+ // map this back to monotonic.
+ var match = realTimeClockSyncRE.exec(eventBase.details);
+ this.model_.realtime_to_monotonic_offset_ms = ts - match[1];
+ }
if (genericClockSyncRE.exec(eventBase.details))
this.traceClockSyncEvent(eventName, cpuNumber, pid, ts, eventBase);
}.bind(this));
« no previous file with comments | « tracing/tracing/extras/importer/android/event_log_importer.html ('k') | tracing/tracing/extras/systrace_config.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698