Commit c0edde29 authored by backer@chromium.org's avatar backer@chromium.org

Revert 124144 - Sync trace time on Chrome OS (just like Android)

Change-Id: I518e0c91a5f48ae1f5909d1e86a8fabfb97d1ec4

BUG=none
TEST=record chrome events using about:tracing simultaneous with kernel events; check the resulting kernel event log for a trace_event_clock_sync record


Review URL: http://codereview.chromium.org/9474023

TBR=sleffler@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9581019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124726 0039d316-1c4b-4281-b951-d872f2087c98
parent a284fe25
...@@ -687,11 +687,11 @@ void TraceLog::AddTraceEventEtw(char phase, ...@@ -687,11 +687,11 @@ void TraceLog::AddTraceEventEtw(char phase,
} }
void TraceLog::AddClockSyncMetadataEvents() { void TraceLog::AddClockSyncMetadataEvents() {
#if defined(OS_ANDROID) || defined(OS_CHROMEOS) #if defined(OS_ANDROID)
// Since Android/ChromeOS do not support sched_setaffinity, we cannot // Since Android does not support sched_setaffinity, we cannot establish clock
// establish clock sync unless the scheduler clock is set to global. // sync unless the scheduler clock is set to global. If the trace_clock file
// If the trace_clock file can't be read, we will assume the kernel // can't be read, we will assume the kernel doesn't support tracing and do
// doesn't support tracing and do nothing. // nothing.
std::string clock_mode; std::string clock_mode;
if (!file_util::ReadFileToString( if (!file_util::ReadFileToString(
FilePath("/sys/kernel/debug/tracing/trace_clock"), FilePath("/sys/kernel/debug/tracing/trace_clock"),
...@@ -706,7 +706,7 @@ void TraceLog::AddClockSyncMetadataEvents() { ...@@ -706,7 +706,7 @@ void TraceLog::AddClockSyncMetadataEvents() {
return; return;
} }
// Linux's kernel trace system has a trace_marker feature: this is a file on // Android's kernel trace system has a trace_marker feature: this is a file on
// debugfs that takes the written data and pushes it onto the trace // debugfs that takes the written data and pushes it onto the trace
// buffer. So, to establish clock sync, we write our monotonic clock into that // buffer. So, to establish clock sync, we write our monotonic clock into that
// trace buffer. // trace buffer.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment