Skip to content

Fix VirtualCallStubManager stats capturing on EE shutdown #102073

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
jkotas merged 2 commits into from
May 13, 2024
Merged

Fix VirtualCallStubManager stats capturing on EE shutdown #102073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0031bf2
Fix VirtualCallStubManager stats capturing on EE shutdown
yurai007 May 10, 2024
9f497d0
Address code review comments
yurai007 May 13, 2024
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
7 changes: 2 additions & 5 deletions src/coreclr/vm/ceemain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,8 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
// This will check a flag and do nothing if not enabled.
Interpreter::PrintPostMortemData();
#endif // FEATURE_INTERPRETER
VirtualCallStubManager::LogFinalStats();
WriteJitHelperCountToSTRESSLOG();

#ifdef PROFILING_SUPPORTED
// If profiling is enabled, then notify of shutdown first so that the
Expand Down Expand Up @@ -1349,11 +1351,6 @@ void STDMETHODCALLTYPE EEShutDownHelper(BOOL fIsDllUnloading)
TerminateDebugger();
#endif // DEBUGGING_SUPPORTED

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

WriteJitHelperCountToSTRESSLOG();

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

#if 0 // Dont clean up the stress log, so that even at process exit we have a log (after all the process is going away
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/vm/virtualcallstub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,9 +769,7 @@ void VirtualCallStubManager::InitStatic()
VirtualCallStubManagerManager::InitStatic();
}

// Static shutdown code.
// At the moment, this doesn't do anything more than log statistics.
void VirtualCallStubManager::UninitStatic()
void VirtualCallStubManager::LogFinalStats()
{
CONTRACTL
{
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/virtualcallstub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,13 @@ class VirtualCallStubManager : public StubManager

// Set up static data structures - called during EEStartup
static void InitStatic();
static void UninitStatic();
static void LogFinalStats();

// Per instance initialization - called during AppDomain::Init and ::Uninit and for collectible loader allocators
void Init(BaseDomain* pDomain, LoaderAllocator *pLoaderAllocator);
void Uninit();

//@TODO: the logging should be tied into the VMs normal loggin mechanisms,
//@TODO: the logging should be tied into the VMs normal logging mechanisms,
//@TODO: for now we just always write a short log file called "StubLog_<pid>.log"
static void StartupLogging();
static void LoggingDump();
Expand Down