From 58729f1bcdcd7b8ac751d10c78a1f7ab867afb74 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 3 Oct 2013 19:27:51 +0200 Subject: [PATCH] src: fix up after botched merge conflict Mea culpa, I didn't properly resolve a merge conflict in the last two commits. The resulting segmentation fault only happened on Linux and only sometimes. Fixes #6306. --- src/node.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/node.cc b/src/node.cc index b29fa35..5da4cd4 100644 --- a/src/node.cc +++ b/src/node.cc @@ -3284,13 +3284,12 @@ Environment* CreateEnvironment(Isolate* isolate, // a prepare or check watcher after us, any samples attributed to its callback // will be recorded with state=IDLE. uv_prepare_init(env->event_loop(), env->idle_prepare_handle()); - uv_prepare_start(env->idle_prepare_handle(), SetIdle); + uv_check_init(env->event_loop(), env->idle_check_handle()); uv_unref(reinterpret_cast(env->idle_prepare_handle())); uv_unref(reinterpret_cast(env->idle_check_handle())); if (v8_is_profiling) { - uv_check_init(env->event_loop(), env->idle_check_handle()); - uv_check_start(env->idle_check_handle(), ClearIdle); + StartProfilerIdleNotifier(env); } Local process_template = FunctionTemplate::New(); -- 2.7.4