fix: iocp integration when process is reused (#33207)

This commit is contained in:
Robo 2022-03-21 16:42:22 +09:00 committed by GitHub
parent e100402b13
commit 4cc2ed842e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 83 additions and 17 deletions

View file

@ -462,7 +462,8 @@ node::Environment* NodeBindings::CreateEnvironment(
args.insert(args.begin() + 1, init_script); args.insert(args.begin() + 1, init_script);
isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform); if (!isolate_data_)
isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform);
node::Environment* env; node::Environment* env;
uint64_t flags = node::EnvironmentFlags::kDefaultFlags | uint64_t flags = node::EnvironmentFlags::kDefaultFlags |
@ -573,16 +574,6 @@ void NodeBindings::LoadEnvironment(node::Environment* env) {
} }
void NodeBindings::PrepareMessageLoop() { void NodeBindings::PrepareMessageLoop() {
#if !BUILDFLAG(IS_WIN)
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.
if (handle == handle_)
return;
handle_ = handle;
#endif
// Add dummy handle for libuv, otherwise libuv would quit when there is // Add dummy handle for libuv, otherwise libuv would quit when there is
// nothing to do. // nothing to do.
uv_async_init(uv_loop_, dummy_uv_handle_.get(), nullptr); uv_async_init(uv_loop_, dummy_uv_handle_.get(), nullptr);

View file

@ -93,11 +93,15 @@ class NodeBindings {
void LoadEnvironment(node::Environment* env); void LoadEnvironment(node::Environment* env);
// Prepare for message loop integration. // Prepare for message loop integration.
void PrepareMessageLoop(); virtual void PrepareMessageLoop();
// Do message loop integration. // Do message loop integration.
virtual void RunMessageLoop(); virtual void RunMessageLoop();
// Gets/sets the per isolate data.
void set_isolate_data(node::IsolateData* isolate_data) {
isolate_data_ = isolate_data;
}
node::IsolateData* isolate_data() const { return isolate_data_; } node::IsolateData* isolate_data() const { return isolate_data_; }
// Gets/sets the environment to wrap uv loop. // Gets/sets the environment to wrap uv loop.
@ -161,10 +165,6 @@ class NodeBindings {
// Isolate data used in creating the environment // Isolate data used in creating the environment
node::IsolateData* isolate_data_ = nullptr; node::IsolateData* isolate_data_ = nullptr;
#if !BUILDFLAG(IS_WIN)
int handle_ = -1;
#endif
base::WeakPtrFactory<NodeBindings> weak_factory_{this}; base::WeakPtrFactory<NodeBindings> weak_factory_{this};
}; };

View file

@ -19,7 +19,25 @@ NodeBindingsLinux::NodeBindingsLinux(BrowserEnvironment browser_env)
NodeBindingsLinux::~NodeBindingsLinux() = default; NodeBindingsLinux::~NodeBindingsLinux() = default;
void NodeBindingsLinux::PrepareMessageLoop() {
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.
if (handle == handle_)
return;
NodeBindings::PrepareMessageLoop();
}
void NodeBindingsLinux::RunMessageLoop() { void NodeBindingsLinux::RunMessageLoop() {
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.
if (handle == handle_)
return;
handle_ = handle;
// Get notified when libuv's watcher queue changes. // Get notified when libuv's watcher queue changes.
uv_loop_->data = this; uv_loop_->data = this;
uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged; uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;

View file

@ -15,6 +15,7 @@ class NodeBindingsLinux : public NodeBindings {
explicit NodeBindingsLinux(BrowserEnvironment browser_env); explicit NodeBindingsLinux(BrowserEnvironment browser_env);
~NodeBindingsLinux() override; ~NodeBindingsLinux() override;
void PrepareMessageLoop() override;
void RunMessageLoop() override; void RunMessageLoop() override;
private: private:
@ -25,6 +26,9 @@ class NodeBindingsLinux : public NodeBindings {
// Epoll to poll for uv's backend fd. // Epoll to poll for uv's backend fd.
int epoll_; int epoll_;
// uv's backend fd.
int handle_ = -1;
}; };
} // namespace electron } // namespace electron

View file

@ -19,7 +19,25 @@ NodeBindingsMac::NodeBindingsMac(BrowserEnvironment browser_env)
NodeBindingsMac::~NodeBindingsMac() = default; NodeBindingsMac::~NodeBindingsMac() = default;
void NodeBindingsMac::PrepareMessageLoop() {
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.
if (handle == handle_)
return;
NodeBindings::PrepareMessageLoop();
}
void NodeBindingsMac::RunMessageLoop() { void NodeBindingsMac::RunMessageLoop() {
int handle = uv_backend_fd(uv_loop_);
// If the backend fd hasn't changed, don't proceed.
if (handle == handle_)
return;
handle_ = handle;
// Get notified when libuv's watcher queue changes. // Get notified when libuv's watcher queue changes.
uv_loop_->data = this; uv_loop_->data = this;
uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged; uv_loop_->on_watcher_queue_updated = OnWatcherQueueChanged;

View file

@ -15,6 +15,7 @@ class NodeBindingsMac : public NodeBindings {
explicit NodeBindingsMac(BrowserEnvironment browser_env); explicit NodeBindingsMac(BrowserEnvironment browser_env);
~NodeBindingsMac() override; ~NodeBindingsMac() override;
void PrepareMessageLoop() override;
void RunMessageLoop() override; void RunMessageLoop() override;
private: private:
@ -22,6 +23,9 @@ class NodeBindingsMac : public NodeBindings {
static void OnWatcherQueueChanged(uv_loop_t* loop); static void OnWatcherQueueChanged(uv_loop_t* loop);
void PollEvents() override; void PollEvents() override;
// uv's backend fd.
int handle_ = -1;
}; };
} // namespace electron } // namespace electron

View file

@ -29,6 +29,29 @@ NodeBindingsWin::NodeBindingsWin(BrowserEnvironment browser_env)
NodeBindingsWin::~NodeBindingsWin() = default; NodeBindingsWin::~NodeBindingsWin() = default;
void NodeBindingsWin::PrepareMessageLoop() {
// IOCP does not change for the process until the loop is recreated,
// we ensure that there is only a single polling thread satisfying
// the concurrency limit set from CreateIoCompletionPort call by
// uv_loop_init for the lifetime of this process.
if (initialized_)
return;
NodeBindings::PrepareMessageLoop();
}
void NodeBindingsWin::RunMessageLoop() {
// Avoid calling UvRunOnce if the loop is already active,
// otherwise it can lead to situations were the number of active
// threads processing on IOCP is greater than the concurrency limit.
if (initialized_)
return;
initialized_ = true;
NodeBindings::RunMessageLoop();
}
void NodeBindingsWin::PollEvents() { void NodeBindingsWin::PollEvents() {
// If there are other kinds of events pending, uv_backend_timeout will // If there are other kinds of events pending, uv_backend_timeout will
// instruct us not to wait. // instruct us not to wait.

View file

@ -15,8 +15,14 @@ class NodeBindingsWin : public NodeBindings {
explicit NodeBindingsWin(BrowserEnvironment browser_env); explicit NodeBindingsWin(BrowserEnvironment browser_env);
~NodeBindingsWin() override; ~NodeBindingsWin() override;
void PrepareMessageLoop() override;
void RunMessageLoop() override;
private: private:
void PollEvents() override; void PollEvents() override;
// Indicates whether polling thread has been created.
bool initialized_ = false;
}; };
} // namespace electron } // namespace electron

View file

@ -162,8 +162,10 @@ void ElectronRendererClient::WillReleaseScriptContext(
isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit); isolate->SetMicrotasksPolicy(v8::MicrotasksPolicy::kExplicit);
node::FreeEnvironment(env); node::FreeEnvironment(env);
if (env == node_bindings_->uv_env()) if (node_bindings_->uv_env() == nullptr) {
node::FreeIsolateData(node_bindings_->isolate_data()); node::FreeIsolateData(node_bindings_->isolate_data());
node_bindings_->set_isolate_data(nullptr);
}
isolate->SetMicrotasksPolicy(old_policy); isolate->SetMicrotasksPolicy(old_policy);