Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/coreclr/nativeaot/Runtime/thread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ void Thread::WaitForGC(PInvokeTransitionFrame* pTransitionFrame)
ClearState(TSF_Redirected);
#endif //FEATURE_SUSPEND_REDIRECTION

// make sure this is cleared - in case a signal is lost or somehow we did not act on it
SetActivationPending(false);

GCHeapUtilities::GetGCHeap()->WaitUntilGCComplete();

// must be in cooperative mode when checking the trap flag
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/Runtime/unix/PalUnix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,11 @@ HijackFunc* PalGetHijackTarget(HijackFunc* defaultHijackTarget)

void PalHijack(Thread* pThreadToHijack)
{
if (pThreadToHijack->IsActivationPending())
{
return;
}

pThreadToHijack->SetActivationPending(true);

int status = pthread_kill(pThreadToHijack->GetOSThreadHandle(), INJECT_ACTIVATION_SIGNAL);
Expand Down