diff options
author | Marcel Laverdet <marcel@laverdet.com> | 2019-11-12 14:26:08 -0800 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-11-20 19:02:55 +0100 |
commit | c712fb7cd6222018cf615fd0071998bde6f16da9 (patch) | |
tree | 2f6713dc39dfea54e6fb6b1a56a82c9da64469a6 /src/node_platform.cc | |
parent | c63af4fea041673eb7c33f6df3c474d4537fe5eb (diff) | |
download | android-node-v8-c712fb7cd6222018cf615fd0071998bde6f16da9.tar.gz android-node-v8-c712fb7cd6222018cf615fd0071998bde6f16da9.tar.bz2 android-node-v8-c712fb7cd6222018cf615fd0071998bde6f16da9.zip |
src: add abstract `IsolatePlatformDelegate`
Adds a new abstract class for module authors and embedders to register
arbitrary isolates with `node::MultiIsolatePlatform`.
PR-URL: https://github.com/nodejs/node/pull/30324
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'src/node_platform.cc')
-rw-r--r-- | src/node_platform.cc | 66 |
1 files changed, 47 insertions, 19 deletions
diff --git a/src/node_platform.cc b/src/node_platform.cc index 6e3b4abfee..383f67ce0f 100644 --- a/src/node_platform.cc +++ b/src/node_platform.cc @@ -230,6 +230,11 @@ PerIsolatePlatformData::PerIsolatePlatformData( uv_unref(reinterpret_cast<uv_handle_t*>(flush_tasks_)); } +std::shared_ptr<v8::TaskRunner> +PerIsolatePlatformData::GetForegroundTaskRunner() { + return shared_from_this(); +} + void PerIsolatePlatformData::FlushTasks(uv_async_t* handle) { auto platform_data = static_cast<PerIsolatePlatformData*>(handle->data); platform_data->FlushForegroundTasksInternal(); @@ -267,7 +272,7 @@ void PerIsolatePlatformData::PostNonNestableDelayedTask( } PerIsolatePlatformData::~PerIsolatePlatformData() { - Shutdown(); + CHECK(!flush_tasks_); } void PerIsolatePlatformData::AddShutdownCallback(void (*callback)(void*), @@ -325,18 +330,32 @@ NodePlatform::NodePlatform(int thread_pool_size, void NodePlatform::RegisterIsolate(Isolate* isolate, uv_loop_t* loop) { Mutex::ScopedLock lock(per_isolate_mutex_); - std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate]; - CHECK(!existing); - per_isolate_[isolate] = - std::make_shared<PerIsolatePlatformData>(isolate, loop); + auto delegate = std::make_shared<PerIsolatePlatformData>(isolate, loop); + IsolatePlatformDelegate* ptr = delegate.get(); + auto insertion = per_isolate_.emplace( + isolate, + std::make_pair(ptr, std::move(delegate))); + CHECK(insertion.second); +} + +void NodePlatform::RegisterIsolate(Isolate* isolate, + IsolatePlatformDelegate* delegate) { + Mutex::ScopedLock lock(per_isolate_mutex_); + auto insertion = per_isolate_.emplace( + isolate, + std::make_pair(delegate, std::shared_ptr<PerIsolatePlatformData>{})); + CHECK(insertion.second); } void NodePlatform::UnregisterIsolate(Isolate* isolate) { Mutex::ScopedLock lock(per_isolate_mutex_); - std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate]; - CHECK(existing); - existing->Shutdown(); - per_isolate_.erase(isolate); + auto existing_it = per_isolate_.find(isolate); + CHECK_NE(existing_it, per_isolate_.end()); + auto& existing = existing_it->second; + if (existing.second) { + existing.second->Shutdown(); + } + per_isolate_.erase(existing_it); } void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate, @@ -344,11 +363,11 @@ void NodePlatform::AddIsolateFinishedCallback(Isolate* isolate, Mutex::ScopedLock lock(per_isolate_mutex_); auto it = per_isolate_.find(isolate); if (it == per_isolate_.end()) { - CHECK(it->second); cb(data); return; } - it->second->AddShutdownCallback(cb, data); + CHECK(it->second.second); + it->second.second->AddShutdownCallback(cb, data); } void NodePlatform::Shutdown() { @@ -394,7 +413,7 @@ void PerIsolatePlatformData::RunForegroundTask(uv_timer_t* handle) { } void NodePlatform::DrainTasks(Isolate* isolate) { - std::shared_ptr<PerIsolatePlatformData> per_isolate = ForIsolate(isolate); + std::shared_ptr<PerIsolatePlatformData> per_isolate = ForNodeIsolate(isolate); do { // Worker tasks aren't associated with an Isolate. @@ -452,23 +471,32 @@ void NodePlatform::CallDelayedOnWorkerThread(std::unique_ptr<Task> task, } +IsolatePlatformDelegate* NodePlatform::ForIsolate(Isolate* isolate) { + Mutex::ScopedLock lock(per_isolate_mutex_); + auto data = per_isolate_[isolate]; + CHECK_NOT_NULL(data.first); + return data.first; +} + std::shared_ptr<PerIsolatePlatformData> -NodePlatform::ForIsolate(Isolate* isolate) { +NodePlatform::ForNodeIsolate(Isolate* isolate) { Mutex::ScopedLock lock(per_isolate_mutex_); - std::shared_ptr<PerIsolatePlatformData> data = per_isolate_[isolate]; - CHECK(data); - return data; + auto data = per_isolate_[isolate]; + CHECK(data.second); + return data.second; } bool NodePlatform::FlushForegroundTasks(Isolate* isolate) { - return ForIsolate(isolate)->FlushForegroundTasksInternal(); + return ForNodeIsolate(isolate)->FlushForegroundTasksInternal(); } -bool NodePlatform::IdleTasksEnabled(Isolate* isolate) { return false; } +bool NodePlatform::IdleTasksEnabled(Isolate* isolate) { + return ForIsolate(isolate)->IdleTasksEnabled(); +} std::shared_ptr<v8::TaskRunner> NodePlatform::GetForegroundTaskRunner(Isolate* isolate) { - return ForIsolate(isolate); + return ForIsolate(isolate)->GetForegroundTaskRunner(); } double NodePlatform::MonotonicallyIncreasingTime() { |