Android: removes "trace_event_clock_sync" from atrace.

base/debug/trace_event_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/trace_event_impl.h"
 
 #include <fcntl.h>
 
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"

[willchan no longer on Chromium, 2013/01/18 16:59:58]

Can we delete this too?

[bulach, 2013/01/18 19:24:28]

Done.

 #include "base/format_macros.h"

[willchan no longer on Chromium, 2013/01/18 16:59:58]

Not clear to me why this is necessary

[bulach, 2013/01/18 19:24:28]

Done.

 #include "base/logging.h"
 #include "base/stringprintf.h"
 
 namespace {
 
 int g_atrace_fd = -1;
 const char* kATraceMarkerFile = "/sys/kernel/debug/tracing/trace_marker";
 
 }  // namespace
 
@@ skipping 60 matching lines @@
         write(g_atrace_fd, out.c_str(), out.size());
       }
       break;
 
     default:
       // Do nothing.
       break;
   }
 }
 
-void TraceLog::AddClockSyncMetadataEvents() {
-  // Since Android does not support sched_setaffinity, we cannot establish clock
-  // sync unless the scheduler clock is set to global. If the trace_clock file
-  // can't be read, we will assume the kernel doesn't support tracing and do
-  // nothing.
-  std::string clock_mode;
-  if (!file_util::ReadFileToString(
-      FilePath("/sys/kernel/debug/tracing/trace_clock"), &clock_mode))
-    return;
-
-  if (clock_mode != "local [global]\n") {
-    DLOG(WARNING) <<
-        "The kernel's tracing clock must be set to global in order for " <<
-        "trace_event to be synchronized with . Do this by\n" <<
-        "  echo global > /sys/kerel/debug/tracing/trace_clock";
-    return;
-  }
-
-  int atrace_fd = g_atrace_fd;
-  if (atrace_fd == -1) {
-    // This function may be called when atrace is not enabled.
-    atrace_fd = open(kATraceMarkerFile, O_WRONLY | O_APPEND);
-    if (atrace_fd == -1) {
-      LOG(WARNING) << "Couldn't open " << kATraceMarkerFile;
-      return;
-    }
-  }
-
-  // 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
-  // buffer. So, to establish clock sync, we write our monotonic clock into that
-  // trace buffer.
-  TimeTicks now = TimeTicks::NowFromSystemTraceTime();
-  double now_in_seconds = now.ToInternalValue() / 1000000.0;
-  std::string marker = StringPrintf(
-      "trace_event_clock_sync: parent_ts=%f\n", now_in_seconds);
-  if (write(atrace_fd, marker.c_str(), marker.size()) != 0) {
-    DLOG(WARNING) << "Couldn't write to " << kATraceMarkerFile << ": "
-                  << strerror(errno);
-  }
-
-  if (g_atrace_fd == -1)
-    close(atrace_fd);
-}
-
 // Must be called with lock_ locked.
 void TraceLog::ApplyATraceEnabledFlag(unsigned char* category_enabled) {
   if (g_atrace_fd != -1)
     *category_enabled |= ATRACE_ENABLED;
 }
 
 }  // namespace debug
 }  // namespace base