ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove debugging code for a fixed 3.6 kernel bug."

Browse source 
am: af61acc

* commit 'af61acc2920618f3cd635dc75dd5e3f417f503a8':
  Remove debugging code for a fixed 3.6 kernel bug.

Change-Id: Iaf60b0b2d5ff87dced048b8094c5d1753d3860b5
This commit is contained in:
Elliott Hughes 2016-04-09 00:29:14 +00:00 • committed by android-build-merger
commit 058fd2edbc
1 changed files with 6 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
libutils/SystemClock.cpp
View file

@ -56,66 +56,12 @@ int64_t elapsedRealtime()
return nanoseconds_to_milliseconds(elapsedRealtimeNano()); return nanoseconds_to_milliseconds(elapsedRealtimeNano());
} }
#define METHOD_CLOCK_GETTIME 0
#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
#if DEBUG_TIMESTAMP && defined(__arm__)
static inline void checkTimeStamps(int64_t timestamp,
int64_t volatile *prevTimestampPtr,
int volatile *prevMethodPtr,
int curMethod)
{
/*
* Disable the check for SDK since the prebuilt toolchain doesn't contain
* gettid, and int64_t is different on the ARM platform
* (ie long vs long long).
*/
int64_t prevTimestamp = *prevTimestampPtr;
int prevMethod = *prevMethodPtr;
if (timestamp < prevTimestamp) {
static const char *gettime_method_names[] = {
"clock_gettime",
"ioctl",
"systemTime",
};
ALOGW("time going backwards: prev %lld(%s) vs now %lld(%s), tid=%d",
prevTimestamp, gettime_method_names[prevMethod],
timestamp, gettime_method_names[curMethod],
gettid());
}
// NOTE - not atomic and may generate spurious warnings if the 64-bit
// write is interrupted or not observed as a whole.
*prevTimestampPtr = timestamp;
*prevMethodPtr = curMethod;
}
#else
#define checkTimeStamps(timestamp, prevTimestampPtr, prevMethodPtr, curMethod)
#endif
/* /*
* native public static long elapsedRealtimeNano(); * native public static long elapsedRealtimeNano();
*/ */
int64_t elapsedRealtimeNano() int64_t elapsedRealtimeNano()
{ {
#if defined(__ANDROID__) #if defined(__ANDROID__)
struct timespec ts;
int result;
int64_t timestamp;
#if DEBUG_TIMESTAMP
static volatile int64_t prevTimestamp;
static volatile int prevMethod;
#endif
static int s_fd = -1; static int s_fd = -1;
if (s_fd == -1) { if (s_fd == -1) {
@ -125,31 +71,20 @@ int64_t elapsedRealtimeNano()
} }
} }
result = ioctl(s_fd, struct timespec ts;
ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &ts); if (ioctl(s_fd, ANDROID_ALARM_GET_TIME(ANDROID_ALARM_ELAPSED_REALTIME), &ts) == 0) {
return seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;
if (result == 0) {
timestamp = seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;
checkTimeStamps(timestamp, &prevTimestamp, &prevMethod, METHOD_IOCTL);
return timestamp;
} }
// /dev/alarm doesn't exist, fallback to CLOCK_BOOTTIME // /dev/alarm doesn't exist, fallback to CLOCK_BOOTTIME
result = clock_gettime(CLOCK_BOOTTIME, &ts); if (clock_gettime(CLOCK_BOOTTIME, &ts) == 0) {
if (result == 0) { return seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;
timestamp = seconds_to_nanoseconds(ts.tv_sec) + ts.tv_nsec;
checkTimeStamps(timestamp, &prevTimestamp, &prevMethod,
METHOD_CLOCK_GETTIME);
return timestamp;
} }
// XXX: there was an error, probably because the driver didn't // XXX: there was an error, probably because the driver didn't
// exist ... this should return // exist ... this should return
// a real error, like an exception! // a real error, like an exception!
timestamp = systemTime(SYSTEM_TIME_MONOTONIC); return systemTime(SYSTEM_TIME_MONOTONIC);
checkTimeStamps(timestamp, &prevTimestamp, &prevMethod,
METHOD_SYSTEMTIME);
return timestamp;
#else #else
return systemTime(SYSTEM_TIME_MONOTONIC); return systemTime(SYSTEM_TIME_MONOTONIC);
#endif #endif