diff options
| author | Matt Loring <mattloring@google.com> | 2016-12-19 10:58:43 -0800 |
|---|---|---|
| committer | Matt Loring <mattloring@google.com> | 2016-12-19 16:28:40 -0800 |
| commit | a308a2fae4386aa71a062f21ee01495611b20606 (patch) | |
| tree | 371100792a494c13e3dabffb44e749b7ac66f986 /deps | |
| parent | 729fecf3905157d05baf36911c6aeaf3543e85c1 (diff) | |
| download | android-node-v8-a308a2fae4386aa71a062f21ee01495611b20606.tar.gz android-node-v8-a308a2fae4386aa71a062f21ee01495611b20606.tar.bz2 android-node-v8-a308a2fae4386aa71a062f21ee01495611b20606.zip | |
deps: cherry-pick 081fce3 from V8 upstream
Original commit message:
ThreadTicks::Now support for Solaris
BUG=v8:5739
Review-Url: https://codereview.chromium.org/2576903004
Cr-Commit-Position: refs/heads/master@{#41771}
PR-URL: https://github.com/nodejs/node/pull/10342
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/include/v8-version.h | 2 | ||||
| -rw-r--r-- | deps/v8/src/base/platform/time.cc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index df187b8307..009a3b1042 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 5 #define V8_MINOR_VERSION 4 #define V8_BUILD_NUMBER 500 -#define V8_PATCH_LEVEL 44 +#define V8_PATCH_LEVEL 45 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc index 76a820955f..6b483382f0 100644 --- a/deps/v8/src/base/platform/time.cc +++ b/deps/v8/src/base/platform/time.cc @@ -639,7 +639,7 @@ bool TimeTicks::IsHighResolutionClockWorking() { bool ThreadTicks::IsSupported() { #if (defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \ - defined(V8_OS_MACOSX) || defined(V8_OS_ANDROID) + defined(V8_OS_MACOSX) || defined(V8_OS_ANDROID) || defined(V8_OS_SOLARIS) return true; #elif defined(V8_OS_WIN) return IsSupportedWin(); @@ -655,6 +655,8 @@ ThreadTicks ThreadTicks::Now() { #elif(defined(_POSIX_THREAD_CPUTIME) && (_POSIX_THREAD_CPUTIME >= 0)) || \ defined(V8_OS_ANDROID) return ThreadTicks(ClockNow(CLOCK_THREAD_CPUTIME_ID)); +#elif V8_OS_SOLARIS + return ThreadTicks(gethrvtime() / Time::kNanosecondsPerMicrosecond); #elif V8_OS_WIN return ThreadTicks::GetForThread(::GetCurrentThread()); #else |