dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[vm/shared] Ensure mutator thread is registered without possibilty of a race.

Browse Source 
Registration of the mutator thread in isolate group should be done as thread is added, under the same atomic operation.
Mutator count changes should be done separately as before, under the same mutex used by `ContainsOnlyOneIsolate`.

Follow-up to https://dart.googlesource.com/sdk/+/acc4ee0b1e3fc94a25bdf24431e7567e20cc663d

Fixes https://github.com/dart-lang/sdk/issues/61459
TEST=isolate_group_bound_init_test

Change-Id: I48bf4121bd097d3745915294c04d1eaae3879e0d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/448503
Reviewed-by: Slava Egorov <vegorov@google.com>
Commit-Queue: Alexander Aprelev <aam@google.com>
This commit is contained in:
Alexander Aprelev
2025-09-08 08:46:51 -07:00
committed by Commit Queue
parent 064339a355
commit 60ce47987d
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/vm/thread.cc
+14 -8
View File
@@ -537,9 +537,9 @@ void Thread::EnterIsolateGroupAsMutator(IsolateGroup* isolate_group,
isolate_group->IncreaseMutatorCount(/*thread=*/nullptr,
/*is_nested_reenter=*/true,
/*was_stolen=*/false);
isolate_group->IncrementIsolateGroupMutatorCount();
Thread* thread = AddActiveThread(isolate_group, /*isolate=*/nullptr,
kMutatorTask, bypass_safepoint);
isolate_group->RegisterIsolateGroupMutator(thread);
RELEASE_ASSERT(thread != nullptr);
// Even if [bypass_safepoint] is true, a thread may need mutator state (e.g.
@@ -583,8 +583,8 @@ void Thread::ExitIsolateGroupAsMutator(bool bypass_safepoint) {
thread->ClearStackLimit();
SuspendThreadInternal(thread, VMTag::kInvalidTagId);
auto group = thread->isolate_group();
group->UnregisterIsolateGroupMutator(thread);
FreeActiveThread(thread, /*isolate=*/nullptr, bypass_safepoint);
group->DecrementIsolateGroupMutatorCount();
group->DecreaseMutatorCount(/*is_nested_exit=*/true);
}
@@ -693,9 +693,12 @@ Thread* Thread::AddActiveThread(IsolateGroup* group,
thread->isolate_ = isolate; // May be nullptr.
thread->isolate_group_ = group;
thread->scheduled_dart_mutator_isolate_ = isolate;
if (isolate != nullptr && task_kind == kMutatorTask) {
ASSERT(thread_registry->threads_lock()->IsOwnedByCurrentThread());
isolate->mutator_thread_ = thread;
if (task_kind == kMutatorTask) {
if (isolate != nullptr) {
isolate->mutator_thread_ = thread;
} else {
group->RegisterIsolateGroupMutator(thread);
}
}
// We start at being at-safepoint (in case any safepoint operation is
@@ -750,9 +753,12 @@ void Thread::FreeActiveThread(Thread* thread,
thread->isolate_ = nullptr;
thread->isolate_group_ = nullptr;
thread->scheduled_dart_mutator_isolate_ = nullptr;
if (isolate != nullptr && thread->task_kind() == kMutatorTask) {
ASSERT(thread_registry->threads_lock()->IsOwnedByCurrentThread());
isolate->mutator_thread_ = nullptr;
if (thread->task_kind() == kMutatorTask) {
if (isolate != nullptr) {
isolate->mutator_thread_ = nullptr;
} else {
group->UnregisterIsolateGroupMutator(thread);
}
}
thread->set_execution_state(Thread::kThreadInNative);
thread->stack_limit_.store(0);