Reviewers: ulan,
Message:
Committed patchset #1 manually as r17614 (presubmit successful).
Description:
Revert "Use CLOCK_MONOTONIC_COARSE and CLOCK_REALTIME_COARSE on Linux if
available."
This reverts commit r17611 for breaking the host toolchain build
for Android (missing clock_gettime() and clock_getres() functions).
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=17614
Please review this at https://codereview.chromium.org/68513002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+0, -41 lines):
M src/platform/time.cc
Index: src/platform/time.cc
diff --git a/src/platform/time.cc b/src/platform/time.cc
index
0b58f195a229b514013af1c520a054c671dd8312..de0ca16473f6b5106485508653cfe797f6632c37
100644
--- a/src/platform/time.cc
+++ b/src/platform/time.cc
@@ -43,15 +43,6 @@
#include "win32-headers.h"
#endif
-#if V8_OS_LINUX
-#if !defined(CLOCK_REALTIME_COARSE)
-#define CLOCK_REALTIME_COARSE 5 // 2.6.32 and up.
-#endif // !defined(CLOCK_REALTIME_COARSE)
-#if !defined(CLOCK_MONOTONIC_COARSE)
-#define CLOCK_MONOTONIC_COARSE 6 // 2.6.32 and up.
-#endif // !defined(CLOCK_MONOTONIC_COARSE)
-#endif // V8_OS_LINUX
-
namespace v8 {
namespace internal {
@@ -280,29 +271,11 @@ FILETIME Time::ToFiletime() const {
#elif V8_OS_POSIX
Time Time::Now() {
-#if V8_OS_LINUX
- // Use CLOCK_REALTIME_COARSE if it's available and has a precision of 1
ms
- // or higher. It's serviced from the vDSO with no system call overhead.
- static clock_t clock_id = -1;
- struct timespec ts;
- if (clock_id == -1) {
- if (clock_getres(CLOCK_REALTIME_COARSE, &ts) || ts.tv_nsec > 1000 *
1000) {
- clock_id = CLOCK_REALTIME;
- } else {
- clock_id = CLOCK_REALTIME_COARSE;
- }
- }
- int result = clock_gettime(clock_id, &ts);
- ASSERT_EQ(0, result);
- USE(result);
- return FromTimespec(ts);
-#else // V8_OS_LINUX
struct timeval tv;
int result = gettimeofday(&tv, NULL);
ASSERT_EQ(0, result);
USE(result);
return FromTimeval(tv);
-#endif // V8_OS_LINUX
}
@@ -597,21 +570,7 @@ TimeTicks TimeTicks::HighResolutionNow() {
ticks = (tv.tv_sec * Time::kMicrosecondsPerSecond + tv.tv_usec);
#elif V8_OS_POSIX
struct timespec ts;
-#if V8_OS_LINUX
- // Use CLOCK_MONOTONIC_COARSE if it's available and has a precision of 1
ms
- // or higher. It's serviced from the vDSO with no system call overhead.
- static clock_t clock_id = -1;
- if (clock_id == -1) {
- if (clock_getres(CLOCK_MONOTONIC_COARSE, &ts) || ts.tv_nsec > 1000 *
1000) {
- clock_id = CLOCK_MONOTONIC;
- } else {
- clock_id = CLOCK_MONOTONIC_COARSE;
- }
- }
- int result = clock_gettime(clock_id, &ts);
-#else
int result = clock_gettime(CLOCK_MONOTONIC, &ts);
-#endif // V8_OS_LINUX
ASSERT_EQ(0, result);
USE(result);
ticks = (ts.tv_sec * Time::kMicrosecondsPerSecond +
--
--
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.
