diff options
author | Ben Cheng <bccheng@google.com> | 2013-09-24 22:39:10 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-24 22:39:11 +0000 |
commit | d38cc182dbfce4a1d7e8e9c16bff10b71128cc01 (patch) | |
tree | aabb2058aa2db07e5ec79679253fd2626b77cd27 | |
parent | 397a3642145dbd0919f8148ff24f0cafe1714b55 (diff) | |
parent | 5cd118178e87c4a6590dc8d8446effa5d5193a9f (diff) | |
download | system_core-d38cc182dbfce4a1d7e8e9c16bff10b71128cc01.zip system_core-d38cc182dbfce4a1d7e8e9c16bff10b71128cc01.tar.gz system_core-d38cc182dbfce4a1d7e8e9c16bff10b71128cc01.tar.bz2 |
Merge "Disable timestamp logging." into klp-dev
-rw-r--r-- | libutils/SystemClock.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libutils/SystemClock.cpp b/libutils/SystemClock.cpp index 4b74889..ac8da88 100644 --- a/libutils/SystemClock.cpp +++ b/libutils/SystemClock.cpp @@ -61,12 +61,20 @@ int64_t elapsedRealtime() #define METHOD_IOCTL 1 #define METHOD_SYSTEMTIME 2 +/* + * To debug/verify the timestamps returned by the kernel, change + * DEBUG_TIMESTAMP to 1 and call the timestamp routine from a single thread + * in the test program. b/10899829 + */ +#define DEBUG_TIMESTAMP 0 + static const char *gettime_method_names[] = { "clock_gettime", "ioctl", "systemTime", }; +#if DEBUG_TIMESTAMP static inline void checkTimeStamps(int64_t timestamp, int64_t volatile *prevTimestampPtr, int volatile *prevMethodPtr, @@ -93,6 +101,9 @@ static inline void checkTimeStamps(int64_t timestamp, *prevMethodPtr = curMethod; #endif } +#else +#define checkTimeStamps(timestamp, prevTimestampPtr, prevMethodPtr, curMethod) +#endif /* * native public static long elapsedRealtimeNano(); @@ -103,8 +114,10 @@ int64_t elapsedRealtimeNano() struct timespec ts; int result; int64_t timestamp; +#if DEBUG_TIMESTAMP static volatile int64_t prevTimestamp; static volatile int prevMethod; +#endif #if 0 /* |