Reviewers: Sven Panne,
Message:
Committed patchset #1 manually as r17644 (presubmit successful).
Description:
CLOCK_REALTIME is 0 on Linux, use -1 for invalid clock id.
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=17644
Please review this at https://codereview.chromium.org/70133003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+8, -4 lines):
M src/platform/time.cc
Index: src/platform/time.cc
diff --git a/src/platform/time.cc b/src/platform/time.cc
index
d87dc24a65619df2e5a3adca6b94f4dc9df87b18..eb5d72fdb12e2572a2b28911ad02b23e9fc40b85
100644
--- a/src/platform/time.cc
+++ b/src/platform/time.cc
@@ -295,8 +295,10 @@ Time Time::Now() {
struct timespec ts;
// Use CLOCK_REALTIME_COARSE if it's available and has a precision of 1ms
// or higher. It's serviced from the vDSO with no system call overhead.
- static clock_t clock_id = static_cast<clock_t>(0);
- if (!clock_id) {
+ static clock_t clock_id = static_cast<clock_t>(-1);
+ STATIC_ASSERT(CLOCK_REALTIME != static_cast<clock_t>(-1));
+ STATIC_ASSERT(CLOCK_REALTIME_COARSE != static_cast<clock_t>(-1));
+ if (clock_id == static_cast<clock_t>(-1)) {
if (clock_getres(CLOCK_REALTIME_COARSE, &ts) == 0
&& ts.tv_nsec <= kNanosecondsPerMillisecond)
clock_id = CLOCK_REALTIME_COARSE;
@@ -611,8 +613,10 @@ TimeTicks TimeTicks::HighResolutionNow() {
#if defined(CLOCK_MONOTONIC_COARSE)
// Use CLOCK_MONOTONIC_COARSE if it's available and has a precision of
1ms
// or higher. It's serviced from the vDSO with no system call overhead.
- static clock_t clock_id = static_cast<clock_t>(0);
- if (!clock_id) {
+ static clock_t clock_id = static_cast<clock_t>(-1);
+ STATIC_ASSERT(CLOCK_MONOTONIC != static_cast<clock_t>(-1));
+ STATIC_ASSERT(CLOCK_MONOTONIC_COARSE != static_cast<clock_t>(-1));
+ if (clock_id == static_cast<clock_t>(-1)) {
if (clock_getres(CLOCK_MONOTONIC_COARSE, &ts) == 0
&& ts.tv_nsec <= Time::kNanosecondsPerMillisecond)
clock_id = CLOCK_MONOTONIC_COARSE;
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
