Skip to content

Commit

Permalink
Fix VirtualCallStubManager stats capturing on EE shutdown
Browse files Browse the repository at this point in the history
Before this change logging stats to StubLog file doesn't work because on EE shutdown
we don't shut down manager. Since it's only about logging we can perform uninit earlier.
  • Loading branch information
yurai007 committed May 10, 2024
1 parent 56d7e5d commit 0031bf2
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/coreclr/vm/ceemain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1326,6 +1326,8 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)

{
CONTRACT_VIOLATION(ModeViolation);
// At the moment, this doesn't do anything more than log statistics.
VirtualCallStubManager::UninitStatic();

// On the new plan, we only do the tear-down under the protection of the loader
// lock -- after the OS has stopped all other threads.
Expand All @@ -1348,10 +1350,6 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
// Terminate the debugging services.
TerminateDebugger();
#endif // DEBUGGING_SUPPORTED

//@TODO: find the right place for this
VirtualCallStubManager::UninitStatic();

WriteJitHelperCountToSTRESSLOG();

STRESS_LOG0(LF_STARTUP, LL_INFO10, "EEShutdown shutting down logging");
Expand Down

0 comments on commit 0031bf2

Please sign in to comment.