Skip to content

Convert CoreCLR classic debug logging to use the minipal mutex #117689

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
jkoritzinsky merged 2 commits into from
Jul 16, 2025
Merged

Convert CoreCLR classic debug logging to use the minipal mutex #117689

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34203aa
Convert CoreCLR classic debug logging to use the minipal mutex
jkoritzinsky Jul 15, 2025
e002ff5
Apply suggestions from code review
jkoritzinsky Jul 15, 2025
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
25 changes: 12 additions & 13 deletions src/coreclr/utilcode/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
static DWORD LogFlags = 0;
static CQuickWSTR szLogFileName;
static HANDLE LogFileHandle = INVALID_HANDLE_VALUE;
static volatile HANDLE LogFileMutex = 0;
static minipal_mutex* volatile LogFileMutex = nullptr;
static DWORD LogFacilityMask = LF_ALL;
static DWORD LogFacilityMask2 = 0;
static DWORD LogVMLevel = LL_INFO100;
Expand Down Expand Up @@ -156,11 +156,9 @@ VOID EnterLogLock()
// rather hard to care about this, as we LOG all over the place.
CONTRACT_VIOLATION(TakesLockViolation);

if(LogFileMutex != 0)
if (LogFileMutex != nullptr)
{
DWORD status;
status = WaitForSingleObjectEx(LogFileMutex, INFINITE, FALSE);
_ASSERTE(WAIT_OBJECT_0 == status);
minipal_mutex_enter(LogFileMutex);
}
}

Expand All @@ -169,11 +167,9 @@ VOID LeaveLogLock()
STATIC_CONTRACT_NOTHROW;
STATIC_CONTRACT_GC_NOTRIGGER;

if(LogFileMutex != 0)
if (LogFileMutex != nullptr)
{
BOOL success;
success = ReleaseMutex(LogFileMutex);
_ASSERTE(success);
minipal_mutex_leave(LogFileMutex);
}
}

Expand All @@ -185,11 +181,14 @@ VOID InitializeLogging()
if (bLoggingInitialized)
return;

HANDLE mutex = CreateMutex(NULL, FALSE, NULL);
_ASSERTE(mutex != 0);
if (InterlockedCompareExchangeT(&LogFileMutex, mutex, 0) != 0)
minipal_mutex* mutex = new minipal_mutex;
bool success = minipal_mutex_init(mutex);
_ASSERTE(success);

if (InterlockedCompareExchangeT(&LogFileMutex, mutex, nullptr) != nullptr)
{
CloseHandle(mutex);
minipal_mutex_destroy(mutex);
delete mutex;
}

EnterLogLock();
Expand Down
Loading