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 <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
parent
6e43dfb6e3
commit
e273abc01b
@ -18,10 +18,29 @@ using v8::TracingController;
|
|||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
|
struct PlatformWorkerData {
|
||||||
|
TaskQueue<Task>* task_queue;
|
||||||
|
Mutex* platform_workers_mutex;
|
||||||
|
ConditionVariable* platform_workers_ready;
|
||||||
|
int* pending_platform_workers;
|
||||||
|
int id;
|
||||||
|
};
|
||||||
|
|
||||||
static void PlatformWorkerThread(void* data) {
|
static void PlatformWorkerThread(void* data) {
|
||||||
|
std::unique_ptr<PlatformWorkerData>
|
||||||
|
worker_data(static_cast<PlatformWorkerData*>(data));
|
||||||
|
|
||||||
|
TaskQueue<Task>* pending_worker_tasks = worker_data->task_queue;
|
||||||
TRACE_EVENT_METADATA1("__metadata", "thread_name", "name",
|
TRACE_EVENT_METADATA1("__metadata", "thread_name", "name",
|
||||||
"PlatformWorkerThread");
|
"PlatformWorkerThread");
|
||||||
TaskQueue<Task>* pending_worker_tasks = static_cast<TaskQueue<Task>*>(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> task = pending_worker_tasks->BlockingPop()) {
|
while (std::unique_ptr<Task> task = pending_worker_tasks->BlockingPop()) {
|
||||||
task->Run();
|
task->Run();
|
||||||
pending_worker_tasks->NotifyOfCompletion();
|
pending_worker_tasks->NotifyOfCompletion();
|
||||||
@ -148,17 +167,31 @@ class WorkerThreadsTaskRunner::DelayedTaskScheduler {
|
|||||||
};
|
};
|
||||||
|
|
||||||
WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) {
|
WorkerThreadsTaskRunner::WorkerThreadsTaskRunner(int thread_pool_size) {
|
||||||
|
Mutex::ScopedLock lock(platform_workers_mutex_);
|
||||||
|
pending_platform_workers_ = thread_pool_size;
|
||||||
|
|
||||||
delayed_task_scheduler_.reset(
|
delayed_task_scheduler_.reset(
|
||||||
new DelayedTaskScheduler(&pending_worker_tasks_));
|
new DelayedTaskScheduler(&pending_worker_tasks_));
|
||||||
threads_.push_back(delayed_task_scheduler_->Start());
|
threads_.push_back(delayed_task_scheduler_->Start());
|
||||||
|
|
||||||
for (int i = 0; i < thread_pool_size; i++) {
|
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<uv_thread_t> t { new uv_thread_t() };
|
std::unique_ptr<uv_thread_t> t { new uv_thread_t() };
|
||||||
if (uv_thread_create(t.get(), PlatformWorkerThread,
|
if (uv_thread_create(t.get(), PlatformWorkerThread,
|
||||||
&pending_worker_tasks_) != 0) {
|
worker_data) != 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
threads_.push_back(std::move(t));
|
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> task) {
|
void WorkerThreadsTaskRunner::PostTask(std::unique_ptr<Task> task) {
|
||||||
|
@ -116,6 +116,10 @@ class WorkerThreadsTaskRunner {
|
|||||||
std::unique_ptr<DelayedTaskScheduler> delayed_task_scheduler_;
|
std::unique_ptr<DelayedTaskScheduler> delayed_task_scheduler_;
|
||||||
|
|
||||||
std::vector<std::unique_ptr<uv_thread_t>> threads_;
|
std::vector<std::unique_ptr<uv_thread_t>> threads_;
|
||||||
|
|
||||||
|
Mutex platform_workers_mutex_;
|
||||||
|
ConditionVariable platform_workers_ready_;
|
||||||
|
int pending_platform_workers_;
|
||||||
};
|
};
|
||||||
|
|
||||||
class NodePlatform : public MultiIsolatePlatform {
|
class NodePlatform : public MultiIsolatePlatform {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user