am 88c52865: am 0faebfb2: Merge "Add trace_event_clock_sync to atrace"

* commit '88c52865f37d9b45c2610b4078bc73f392864572':
  Add trace_event_clock_sync to atrace
This commit is contained in:
John Reck 2015-03-27 00:28:25 +00:00 committed by Android Git Automerger
commit 3e785e2ef9

View File

@ -35,6 +35,7 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include <utils/String8.h> #include <utils/String8.h>
#include <utils/Timers.h>
#include <utils/Trace.h> #include <utils/Trace.h>
using namespace android; using namespace android;
@ -192,6 +193,9 @@ static const char* k_tracingOnPath =
static const char* k_tracePath = static const char* k_tracePath =
"/sys/kernel/debug/tracing/trace"; "/sys/kernel/debug/tracing/trace";
static const char* k_traceMarkerPath =
"/sys/kernel/debug/tracing/trace_marker";
// Check whether a file exists. // Check whether a file exists.
static bool fileExists(const char* filename) { static bool fileExists(const char* filename) {
return access(filename, F_OK) != -1; return access(filename, F_OK) != -1;
@ -254,6 +258,14 @@ static bool appendStr(const char* filename, const char* str)
return _writeStr(filename, str, O_APPEND|O_WRONLY); return _writeStr(filename, str, O_APPEND|O_WRONLY);
} }
static void writeClockSyncMarker()
{
char buffer[128];
float now_in_seconds = systemTime(CLOCK_MONOTONIC) / 1000000000.0f;
snprintf(buffer, 128, "trace_event_clock_sync: parent_ts=%f\n", now_in_seconds);
writeStr(k_traceMarkerPath, buffer);
}
// Enable or disable a kernel option by writing a "1" or a "0" into a /sys // Enable or disable a kernel option by writing a "1" or a "0" into a /sys
// file. // file.
static bool setKernelOptionEnable(const char* filename, bool enable) static bool setKernelOptionEnable(const char* filename, bool enable)
@ -631,6 +643,7 @@ static bool startTrace()
// Disable tracing in the kernel. // Disable tracing in the kernel.
static void stopTrace() static void stopTrace()
{ {
writeClockSyncMarker();
setTracingEnabled(false); setTracingEnabled(false);
} }