Commit 4667c5e
src: start heap object tracking after platform is initialized
Garbage collection is triggered by the heap object tracker. The garbage
collector may spawn garbage collection tasks on the foreground thread.
This is only allowed after registering the isolate in the platform
which happens in IsolateData. This CL moves the starting of the heap
object tracker after calling IsolateData to ensure that.
PR-URL: #17249
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>1 parent 0488782 commit 4667c5e
1 file changed
Lines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4887,10 +4887,6 @@ inline int Start(uv_loop_t* event_loop, | |||
| 4887 | 4887 | isolate->SetAutorunMicrotasks(false); | |
| 4888 | 4888 | isolate->SetFatalErrorHandler(OnFatalError); | |
| 4889 | 4889 | ||
| 4890 | - if (track_heap_objects) { | ||
| 4891 | - isolate->GetHeapProfiler()->StartTrackingHeapObjects(true); | ||
| 4892 | - } | ||
| 4893 | - | ||
| 4894 | 4890 | { | |
| 4895 | 4891 | Mutex::ScopedLock scoped_lock(node_isolate_mutex); | |
| 4896 | 4892 | CHECK_EQ(node_isolate, nullptr); | |
@@ -4907,6 +4903,9 @@ inline int Start(uv_loop_t* event_loop, | |||
| 4907 | 4903 | event_loop, | |
| 4908 | 4904 | v8_platform.Platform(), | |
| 4909 | 4905 | allocator.zero_fill_field()); | |
| 4906 | + if (track_heap_objects) { | ||
| 4907 | + isolate->GetHeapProfiler()->StartTrackingHeapObjects(true); | ||
| 4908 | + } | ||
| 4910 | 4909 | exit_code = Start(isolate, &isolate_data, argc, argv, exec_argc, exec_argv); | |
| 4911 | 4910 | } | |
| 4912 | 4911 | ||
0 commit comments