diff options
| author | Narayan Kamath <narayan@google.com> | 2014-04-15 11:02:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 11:02:59 +0000 |
| commit | 48030e68e5d2d763ab9c1ca88036837e1e4f3c08 (patch) | |
| tree | 994ea757e2453e2ab76899b4ac5a1b08f92b2631 | |
| parent | c5aff68693dee788a28a0d0256782cc8521aa2a5 (diff) | |
| parent | e7ddcad89f2950d58b4022b55f2cf693daac2e19 (diff) | |
| download | system_core-48030e68e5d2d763ab9c1ca88036837e1e4f3c08.zip system_core-48030e68e5d2d763ab9c1ca88036837e1e4f3c08.tar.gz system_core-48030e68e5d2d763ab9c1ca88036837e1e4f3c08.tar.bz2 | |
am e7ddcad8: am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."
* commit 'e7ddcad89f2950d58b4022b55f2cf693daac2e19':
HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.
| -rw-r--r-- | libutils/Timers.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libutils/Timers.cpp b/libutils/Timers.cpp index 5293cd2..a431e92 100644 --- a/libutils/Timers.cpp +++ b/libutils/Timers.cpp @@ -34,7 +34,7 @@ nsecs_t systemTime(int clock) { -#if defined(HAVE_POSIX_CLOCKS) +#if defined(HAVE_ANDROID_OS) static const clockid_t clocks[] = { CLOCK_REALTIME, CLOCK_MONOTONIC, @@ -47,7 +47,9 @@ nsecs_t systemTime(int clock) clock_gettime(clocks[clock], &t); return nsecs_t(t.tv_sec)*1000000000LL + t.tv_nsec; #else - // we don't support the clocks here. + // Clock support varies widely across hosts. Mac OS doesn't support + // posix clocks, older glibcs don't support CLOCK_BOOTTIME and Windows + // is windows. struct timeval t; t.tv_sec = t.tv_usec = 0; gettimeofday(&t, NULL); |