Skip to content
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

Jump to bottom

Don't shut down event pipe in DLLs on Windows #91715

Merged
merged 6 commits into from
Sep 14, 2023
Merged

Don't shut down event pipe in DLLs on Windows #91715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94c29dd
Revert "Error out when NativeLib has EventPipe enabled (#90811)"
MichalStrehovsky Sep 7, 2023
d310536
Don't shut down event pipe in DLLs on Windows
MichalStrehovsky Sep 7, 2023
8c40696
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
agocke Sep 7, 2023
c47a068
Apply suggestions from code review
MichalStrehovsky Sep 8, 2023
c04885d
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
MichalStrehovsky Sep 13, 2023
0a55df4
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
MichalStrehovsky Sep 14, 2023
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
10 changes: 8 additions & 2 deletions src/coreclr/nativeaot/Bootstrap/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static char& __unbox_z = __stop___unbox;

#endif // _MSC_VER

extern "C" bool RhInitialize();
extern "C" bool RhInitialize(bool isDll);
extern "C" void RhSetRuntimeInitializationCallback(int (*fPtr)());

extern "C" bool RhRegisterOSModule(void * pModule,
Expand Down Expand Up @@ -164,7 +164,13 @@ extern "C" void __managed__Startup();

static int InitializeRuntime()
{
if (!RhInitialize())
if (!RhInitialize(
#ifdef NATIVEAOT_DLL
/* isDll */ true
#else
/* isDll */ false
#endif
))
return -1;

void * osModule = PalGetModuleHandleFromPointer((void*)&NATIVEAOT_ENTRYPOINT);
Expand Down
3 changes: 1 addition & 2 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
Text="RuntimeIdentifier is required for native compilation. Try running dotnet publish with the -r option value specified." />
<Error Condition="'$(GeneratePackageOnBuild)' == 'true'" Text="GeneratePackageOnBuild is not supported for native compilation." />
<Error Condition="'$(OutputType)' != 'Library' and '$(NativeLib)' != '' and '$(CustomNativeMain)' != 'true'" Text="NativeLib requires OutputType=Library." />
<!-- See https://github.com/dotnet/runtime/issues/89346 for details -->
<Error Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true'" Text="EventSource is not supported when compiling to a native library. Set EventSourceSupport to false." />
<Warning Condition="'$(NativeLib)' != '' and '$(EventSourceSupport)' == 'true' and '$(_SuppressNativeLibEventSourceWarning)' != 'true'" Text="EventSource is not supported or recommended when compiling to a native library. Please go to https://github.com/dotnet/runtime/issues/91762 for more details." />

agocke marked this conversation as resolved.
Show resolved Hide resolved
<Error Condition="'$(PublishTrimmed)' == 'false'" Text="PublishTrimmed is implied by native compilation and cannot be disabled." />

Expand Down
22 changes: 19 additions & 3 deletions src/coreclr/nativeaot/Runtime/startup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ static void UninitDLL()
Thread* g_threadPerformingShutdown = NULL;
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
bool g_safeToShutdownTracing;
#endif

static void __cdecl OnProcessExit()
{
#ifdef _WIN32
Expand All @@ -304,8 +308,16 @@ static void __cdecl OnProcessExit()
#endif

#ifdef FEATURE_PERFTRACING
EventPipe_Shutdown();
DiagnosticServer_Shutdown();
#ifdef _WIN32
// We forgo shutting down event pipe if it wouldn't be safe and could lead to a hang.
// If there was an active trace session, the trace will likely be corrupted without
// orderly shutdown. See https://github.com/dotnet/runtime/issues/89346.
if (g_safeToShutdownTracing)
#endif
{
EventPipe_Shutdown();
DiagnosticServer_Shutdown();
}
#endif
}

Expand Down Expand Up @@ -343,7 +355,7 @@ void RuntimeThreadShutdown(void* thread)
#endif
}

extern "C" bool RhInitialize()
extern "C" bool RhInitialize(bool isDll)
{
if (!PalInit())
return false;
Expand All @@ -352,6 +364,10 @@ extern "C" bool RhInitialize()
atexit(&OnProcessExit);
#endif

#if defined(_WIN32) && defined(FEATURE_PERFTRACING)
g_safeToShutdownTracing = !isDll;
#endif

if (!InitDLL(PalGetModuleHandleFromPointer((void*)&RhInitialize)))
return false;

Expand Down