Skip to content

Followon changes from code review comments in the Monitor HMF removal change #113857

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
Mar 31, 2025
Merged

Followon changes from code review comments in the Monitor HMF removal change #113857

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
91f70fd
Address issues noted in Aaron's code review
davidwrighton Mar 24, 2025
30a1446
Merge branch 'main' into followon_monitor_codereview_fixes
davidwrighton Mar 31, 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
9 changes: 5 additions & 4 deletions src/coreclr/System.Private.CoreLib/src/System/Threading/Monitor.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private enum LeaveHelperAction
Yield = 2,
Contention = 3,
Error = 4,
};
}

[MethodImpl(MethodImplOptions.InternalCall)]
private static extern EnterHelperResult TryEnter_FastPath_WithTimeout(object obj, int timeout);
Expand Down Expand Up @@ -92,6 +92,8 @@ private static bool TryEnter_Slowpath(object obj)
[MethodImpl(MethodImplOptions.NoInlining)]
private static bool TryEnter_Slowpath(object obj, int timeout)
{
ArgumentOutOfRangeException.ThrowIfLessThan(timeout, -1, null);

if (TryEnter_Slowpath(ObjectHandleOnStack.Create(ref obj), timeout) != 0)
{
return true;
Expand Down Expand Up @@ -170,13 +172,12 @@ internal static void ExitIfLockTaken(object obj, ref bool lockTaken)
{
LeaveHelperAction exitBehavior = Exit_FastPath(obj);

if (exitBehavior == LeaveHelperAction.None)
if (exitBehavior != LeaveHelperAction.None)
{
lockTaken = false;
Exit_Slowpath(exitBehavior, obj);
return;
}

Exit_Slowpath(exitBehavior, obj);
lockTaken = false;
}
}
Expand Down
12 changes: 2 additions & 10 deletions src/coreclr/classlibnative/bcltype/objectnative.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,7 @@ FCIMPL1(FC_BOOL_RET, ObjectNative::Monitor_TryEnter_FastPath, Object* obj)
{
FCALL_CONTRACT;

if (obj->TryEnterObjMonitorSpinHelper())
{
FC_RETURN_BOOL(TRUE);
}
else
{
FC_RETURN_BOOL(FALSE);
}
FC_RETURN_BOOL(obj->TryEnterObjMonitorSpinHelper());
}
FCIMPLEND

Expand Down Expand Up @@ -274,8 +267,7 @@ extern "C" INT32 QCALLTYPE Monitor_TryEnter_Slowpath(QCall::ObjectHandleOnStack

GCX_COOP();

if (timeOut < -1)
COMPlusThrow(kArgumentOutOfRangeException);
_ASSERTE(timeOut >= -1); // This should be checked in managed code.

result = objHandle.Get()->TryEnterObjMonitor(timeOut);

Expand Down
Loading