diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-11-16 17:57:15 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-11-16 17:58:42 +0100 |
| commit | b6a3b0a6297ee205aa34d357edd55b79f91cdf09 (patch) | |
| tree | f962b088681f43d7a17615cad54fedbf938b00f8 /deps/uv/src/unix/darwin.c | |
| parent | e2bcff9aa75e51b9ba071330fe712180abed03e0 (diff) | |
| download | android-node-v8-b6a3b0a6297ee205aa34d357edd55b79f91cdf09.tar.gz android-node-v8-b6a3b0a6297ee205aa34d357edd55b79f91cdf09.tar.bz2 android-node-v8-b6a3b0a6297ee205aa34d357edd55b79f91cdf09.zip | |
deps: upgrade libuv to 665a316
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index cc7c817c4d..f40efb2fcd 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -55,6 +55,9 @@ int uv__platform_loop_init(uv_loop_t* loop, int default_loop) { CFRunLoopSourceContext ctx; int r; + if (uv__kqueue_init(loop)) + return -1; + loop->cf_loop = NULL; if ((r = uv_mutex_init(&loop->cf_mutex))) return r; @@ -174,19 +177,12 @@ void uv__cf_loop_signal(uv_loop_t* loop, cf_loop_signal_cb cb, void* arg) { uint64_t uv_hrtime(void) { - uint64_t time; - uint64_t enano; - static mach_timebase_info_data_t sTimebaseInfo; - - time = mach_absolute_time(); - - if (0 == sTimebaseInfo.denom) { - (void)mach_timebase_info(&sTimebaseInfo); - } + mach_timebase_info_data_t info; - enano = time * sTimebaseInfo.numer / sTimebaseInfo.denom; + if (mach_timebase_info(&info) != KERN_SUCCESS) + abort(); - return enano; + return mach_absolute_time() * info.numer / info.denom; } |