Skip to content

Commit

Permalink
src: add consistency check to node_platform.cc
Browse files Browse the repository at this point in the history
We use the `Isolate*` pointer as the sole identifier
for a V8 Isolate. In some environments (e.g. multi-threaded),
Isolates may be destroyed and new ones created; then, it
may happen that the memory that was previously used for
one `Isolate` can be re-used for another `Isolate`
after the first one has been disposed of.

This check is a little guard against accidentally
re-using the same per-Isolate platform data structure
in such cases, i.e. making sure (to the degree to which
that is possible) that the old `Isolate*` has been properly
unregistered before one at the same memory address is added.

(It’s not 100 % foolproof because the `uv_loop_t*`
pointer value could theoretically be the same as well.)

PR-URL: #21156
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
addaleax authored and targos committed Jun 13, 2018
1 parent 79b3423 commit 4757771
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/node_platform.cc
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ void NodePlatform::RegisterIsolate(IsolateData* isolate_data, uv_loop_t* loop) {
Mutex::ScopedLock lock(per_isolate_mutex_);
std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate];
if (existing) {
CHECK_EQ(loop, existing->event_loop());
existing->ref();
} else {
per_isolate_[isolate] =
Expand Down
2 changes: 2 additions & 0 deletions src/node_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ class PerIsolatePlatformData :
bool FlushForegroundTasksInternal();
void CancelPendingDelayedTasks();

const uv_loop_t* event_loop() const { return loop_; }

private:
void DeleteFromScheduledTasks(DelayedTask* task);

Expand Down

0 comments on commit 4757771

Please sign in to comment.