Commit 4757771
src: add consistency check to node_platform.cc
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>1 parent 79b3423 commit 4757771
2 files changed
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -141,6 +141,7 @@ void NodePlatform::RegisterIsolate(IsolateData* isolate_data, uv_loop_t* loop) { | |||
| 141 | 141 | Mutex::ScopedLock lock(per_isolate_mutex_); | |
| 142 | 142 | std::shared_ptr<PerIsolatePlatformData> existing = per_isolate_[isolate]; | |
| 143 | 143 | if (existing) { | |
| 144 | + CHECK_EQ(loop, existing->event_loop()); | ||
| 144 | 145 | existing->ref(); | |
| 145 | 146 | } else { | |
| 146 | 147 | per_isolate_[isolate] = | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -72,6 +72,8 @@ class PerIsolatePlatformData : | |||
| 72 | 72 | bool FlushForegroundTasksInternal(); | |
| 73 | 73 | void CancelPendingDelayedTasks(); | |
| 74 | 74 | ||
| 75 | + const uv_loop_t* event_loop() const { return loop_; } | ||
| 76 | + | ||
| 75 | 77 | private: | |
| 76 | 78 | void DeleteFromScheduledTasks(DelayedTask* task); | |
| 77 | 79 | ||
0 commit comments