From e273abc01be9f04511e44cacea20c4f4935b970f Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Wed, 26 Sep 2018 15:58:45 -0700 Subject: [PATCH] src: ready background workers before bootstrap Make sure background workers are ready before proceeding with the bootstrap or post-bootstrap execution of any code that may trigger `process.exit()`. Fixes: https://github.com/nodejs/node/issues/23065 PR-URL: https://github.com/nodejs/node/pull/23233 Reviewed-By: James M Snell Reviewed-By: Anna Henningsen --- src/node_platform.cc | 37 +++++++++++++++++++++++++++++++++++-- src/node_platform.h | 4 ++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/node_platform.cc b/src/node_platform.cc index 1c237159f2d2e9..b583ce85423fb1 100644 --- a/src/node_platform.cc +++ b/src/node_platform.cc @@ -18,10 +18,29 @@ using v8::TracingController; namespace { +struct PlatformWorkerData { + TaskQueue* task_queue; + Mutex* platform_workers_mutex; + ConditionVariable* platform_workers_ready; + int* pending_platform_workers; + int id; +}; + static void PlatformWorkerThread(void* data) { + std::unique_ptr + worker_data(static_cast(data)); + + TaskQueue* pending_worker_tasks = worker_data->task_queue; TRACE_EVENT_METADATA1("__metadata", "thread_name", "name", "PlatformWorkerThread"); - TaskQueue* pending_worker_tasks = static_cast*>(data); + + // Notify the main thread that the platform worker is ready. + { + Mutex::ScopedLock lock(*worker_data->platform_workers_mutex); + (*worker_data->pending_platform_workers)--; + worker_data->platform_workers_ready->Signal(lock); + } + while (std::unique_ptr task = pending_worker_tasks->BlockingPop()) { task->Run(); pending_worker_tasks->NotifyOfCompletion(); @@ -148,17 +167,31 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler { }; WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) { + Mutex::ScopedLock lock(platform_workers_mutex_); + pending_platform_workers_ = thread_pool_size; + delayed_task_scheduler_.reset( new DelayedTaskScheduler(&pending_worker_tasks_)); threads_.push_back(delayed_task_scheduler_->Start()); + 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 + }; std::unique_ptr t { new uv_thread_t() }; if (uv_thread_create(t.get(), PlatformWorkerThread, - &pending_worker_tasks_) != 0) { + worker_data) != 0) { break; } threads_.push_back(std::move(t)); } + + // Wait for platform workers to initialize before continuing with the + // bootstrap. + while (pending_platform_workers_ > 0) { + platform_workers_ready_.Wait(lock); + } } void WorkerThreadsTaskRunner::PostTask(std::unique_ptr task) { diff --git a/src/node_platform.h b/src/node_platform.h index 9b9720f63804d5..197d5cee3968a7 100644 --- a/src/node_platform.h +++ b/src/node_platform.h @@ -116,6 +116,10 @@ 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 {