Skip to content

[release/7.0] [NativeAOT] do not do shutdown for the main thread on Windows #74712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2022
Merged

[release/7.0] [NativeAOT] do not do shutdown for the main thread on Windows #74712

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190ddf5
do not do shutdown for the main thread
VSadov Aug 26, 2022
3fc0e68
specialcase the thread that called RhpShutdown instead
VSadov Aug 26, 2022
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
18 changes: 13 additions & 5 deletions src/coreclr/nativeaot/Runtime/startup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static void UninitDLL()
#endif // PROFILE_STARTUP
}

volatile bool g_processShutdownHasStarted = false;
volatile Thread* g_threadPerformingShutdown = NULL;

static void DllThreadDetach()
{
Expand All @@ -413,7 +413,7 @@ static void DllThreadDetach()
{
// Once shutdown starts, RuntimeThreadShutdown callbacks are ignored, implying that
// it is no longer guaranteed that exiting threads will be detached.
if (!g_processShutdownHasStarted)
if (g_threadPerformingShutdown != NULL)
{
ASSERT_UNCONDITIONALLY("Detaching thread whose home fiber has not been detached");
RhFailFast();
Expand All @@ -439,9 +439,17 @@ void RuntimeThreadShutdown(void* thread)
}
#else
ASSERT((Thread*)thread == ThreadStore::GetCurrentThread());

// Do not do shutdown for the thread that performs the shutdown.
// other threads could be terminated before it and could leave TLS locked
if ((Thread*)thread == g_threadPerformingShutdown)
{
return;
}

#endif

ThreadStore::DetachCurrentThread(g_processShutdownHasStarted);
ThreadStore::DetachCurrentThread(g_threadPerformingShutdown != NULL);
}

extern "C" bool RhInitialize()
Expand Down Expand Up @@ -474,11 +482,11 @@ COOP_PINVOKE_HELPER(void, RhpEnableConservativeStackReporting, ())
COOP_PINVOKE_HELPER(void, RhpShutdown, ())
{
// Indicate that runtime shutdown is complete and that the caller is about to start shutting down the entire process.
g_processShutdownHasStarted = true;
g_threadPerformingShutdown = ThreadStore::RawGetCurrentThread();
}

#ifdef _WIN32
EXTERN_C UInt32_BOOL WINAPI RtuDllMain(HANDLE hPalInstance, uint32_t dwReason, void* /*pvReserved*/)
EXTERN_C UInt32_BOOL WINAPI RtuDllMain(HANDLE hPalInstance, uint32_t dwReason, void* pvReserved)
{
switch (dwReason)
{
Expand Down