diff --git a/src/node_platform.cc b/src/node_platform.cc index 372a76fabe8a85..047cb43268929a 100644 --- a/src/node_platform.cc +++ b/src/node_platform.cc @@ -167,8 +167,11 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler { }; WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) { - Mutex::ScopedLock lock(platform_workers_mutex_); - pending_platform_workers_ = thread_pool_size; + Mutex platform_workers_mutex; + ConditionVariable platform_workers_ready; + + Mutex::ScopedLock lock(platform_workers_mutex); + int pending_platform_workers = thread_pool_size; delayed_task_scheduler_.reset( new DelayedTaskScheduler(&pending_worker_tasks_)); @@ -176,8 +179,8 @@ WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) { for (int i = 0; i < thread_pool_size; i++) { PlatformWorkerData* worker_data = new PlatformWorkerData{ - &pending_worker_tasks_, &platform_workers_mutex_, - &platform_workers_ready_, &pending_platform_workers_, i + &pending_worker_tasks_, &platform_workers_mutex, + &platform_workers_ready, &pending_platform_workers, i }; std::unique_ptr t { new uv_thread_t() }; if (uv_thread_create(t.get(), PlatformWorkerThread, @@ -189,8 +192,8 @@ WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) { // Wait for platform workers to initialize before continuing with the // bootstrap. - while (pending_platform_workers_ > 0) { - platform_workers_ready_.Wait(lock); + while (pending_platform_workers > 0) { + platform_workers_ready.Wait(lock); } } diff --git a/src/node_platform.h b/src/node_platform.h index 441322a325b3c2..1308d4df6aa249 100644 --- a/src/node_platform.h +++ b/src/node_platform.h @@ -117,10 +117,6 @@ class WorkerThreadsTaskRunner { std::unique_ptr delayed_task_scheduler_; std::vector> threads_; - - Mutex platform_workers_mutex_; - ConditionVariable platform_workers_ready_; - int pending_platform_workers_; }; class NodePlatform : public MultiIsolatePlatform {