diff options
author | Martijn Coenen <maco@google.com> | 2015-09-07 07:38:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-07 07:38:29 +0000 |
commit | c2874048d0bbc6739b083bd84c7476a7fa6550e3 (patch) | |
tree | c999591604b70eeafd159362dd80f09bfbe8d6a8 | |
parent | 8d13427f6febd7a2abf3946a21dd826d55791f21 (diff) | |
parent | 5ca0c2ede8a8d3f499dd7d27832713d4ce16d4ba (diff) | |
download | frameworks_native-c2874048d0bbc6739b083bd84c7476a7fa6550e3.zip frameworks_native-c2874048d0bbc6739b083bd84c7476a7fa6550e3.tar.gz frameworks_native-c2874048d0bbc6739b083bd84c7476a7fa6550e3.tar.bz2 |
am 5ca0c2ed: am 624408ee: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
* commit '5ca0c2ede8a8d3f499dd7d27832713d4ce16d4ba':
Map realtime to clock_monotonic.
-rw-r--r-- | cmds/atrace/atrace.cpp | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 9def406..26c5b4a 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp @@ -264,9 +264,27 @@ static bool appendStr(const char* filename, const char* str) static void writeClockSyncMarker() { char buffer[128]; + int len = 0; + int fd = open(k_traceMarkerPath, O_WRONLY); + if (fd == -1) { + fprintf(stderr, "error opening %s: %s (%d)\n", k_traceMarkerPath, + strerror(errno), errno); + return; + } 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); + + len = snprintf(buffer, 128, "trace_event_clock_sync: parent_ts=%f\n", now_in_seconds); + if (write(fd, buffer, len) != len) { + fprintf(stderr, "error writing clock sync marker %s (%d)\n", strerror(errno), errno); + } + + int64_t realtime_in_ms = systemTime(CLOCK_REALTIME) / 1000000; + len = snprintf(buffer, 128, "trace_event_clock_sync: realtime_ts=%" PRId64 "\n", realtime_in_ms); + if (write(fd, buffer, len) != len) { + fprintf(stderr, "error writing clock sync marker %s (%d)\n", strerror(errno), errno); + } + + close(fd); } // Enable or disable a kernel option by writing a "1" or a "0" into a /sys @@ -646,7 +664,6 @@ static bool startTrace() // Disable tracing in the kernel. static void stopTrace() { - writeClockSyncMarker(); setTracingEnabled(false); } @@ -940,6 +957,7 @@ int main(int argc, char **argv) // another. ok = clearTrace(); + writeClockSyncMarker(); if (ok && !async) { // Sleep to allow the trace to be captured. struct timespec timeLeft; |