Skip to content

Move the implementation of Monitor to managed in CoreCLR - #118371

Merged
jkoritzinsky merged 59 commits into
dotnet:mainfrom
jkoritzinsky:monitor-managed
Oct 30, 2025
Merged

Move the implementation of Monitor to managed in CoreCLR#118371
jkoritzinsky merged 59 commits into
dotnet:mainfrom
jkoritzinsky:monitor-managed

Conversation

@jkoritzinsky

@jkoritzinskyjkoritzinsky commented Aug 5, 2025•
edited
Loading

Copy link
Copy Markdown
Member

This allows us to share more code with NativeAOT, reduce a decent amount of complexity in the runtime, and fixes a blocking issue for #117788

@jkoritzinskyjkoritzinsky added this to the 11.0.0 milestone Aug 5, 2025
AaronRobinsonMSFT
AaronRobinsonMSFT reviewed Aug 5, 2025
View reviewed changes
Comment threadsrc/coreclr/vm/comsynchronizable.cpp Outdated
jkotas
jkotas reviewed Aug 8, 2025
View reviewed changes
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/SyncTable.CoreCLR.cs Outdated
@jkotasjkotas mentioned this pull request Aug 8, 2025
Closed
1 task
This was referenced Aug 8, 2025
Closed
Closed
Open
Open
Closed
Closed
Open
jkotas
jkotas reviewed Aug 15, 2025
View reviewed changes
Comment threadsrc/coreclr/vm/comsynchronizable.cpp Outdated
@build-analysisbuild-analysisBot mentioned this pull request Aug 16, 2025
Open
@jkoritzinsky
WIP: Move Monitor impl from unmanaged code to managed in CoreCLR
945e059
@jkoritzinsky
Clean up the build
424d0bb
@jkoritzinsky
Unify Condition implementation
4d24c00
@jkoritzinsky
Fix Mono and CoreCLR builds
5c0fc6d
@jkoritzinsky
Assert index for sync block
1e75f44
@jkoritzinsky
More ifdefs for mono
fe8e4c4
@jkoritzinsky
Add back ExitIfLockTaken for JIT helper
8c0d783
@jkoritzinsky
Fix GC mode
1b4807b
@jkoritzinsky
Fix musl build and make gc modes explicit
ddffcac
@jkoritzinsky
Split GetLockObject's implementation into a fast FCall and a slow QCall
72d563f
@jkoritzinsky
Fix some asserts
bf4f5b0
@jkoritzinsky
Lock uses 0-based recursion count. Also, only read the thin-lock memb…
b5eafc5
…er once to avoid racing.
Furthermore, handle an uninitialized lock ID in ObjectHeader.CoreCLR.cs. There's a possibility that the first time the managed Lock type's thread id tracking is used is on releasing a lock that was upgraded to a fat lock.
@jkoritzinsky
Fix musl build
85b759f
@jkoritzinsky
FIx one more musl problem
1a9a833
@jkoritzinsky
Refactor out the object header spinlocking so we can use it on the th…
6a9b762
…inlock for thin->fat lock upgrading
CopilotAI mentioned this pull request Oct 28, 2025
Merged
jkotas
jkotas reviewed Oct 28, 2025
View reviewed changes
Comment threadsrc/coreclr/vm/comwaithandle.cpp Outdated
Comment threadsrc/coreclr/vm/comwaithandle.cpp Outdated
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/WaitHandle.CoreCLR.cs Outdated
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/Monitor.CoreCLR.cs Outdated
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/Monitor.CoreCLR.cs Outdated
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/Monitor.CoreCLR.cs Outdated
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs Outdated
Comment threadsrc/coreclr/nativeaot/System.Private.CoreLib/src/System/Threading/Lock.NativeAot.cs Outdated
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Lock.cs Outdated
jkotas
jkotas reviewed Oct 29, 2025
View reviewed changes
Comment threadsrc/coreclr/System.Private.CoreLib/src/System/Threading/SynchronizedMethodHelpers.CoreCLR.cs Outdated
jkotas
jkotas approved these changes Oct 29, 2025
View reviewed changes

@jkotasjkotas left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (modulo one last nit)

jkotas
jkotas reviewed Oct 29, 2025
View reviewed changes
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Monitor.cs
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Monitor.cs
Comment threadsrc/libraries/System.Private.CoreLib/src/System/Threading/Monitor.cs
This was referenced Oct 29, 2025
Open
Open
@jkoritzinsky
jkoritzinsky enabled auto-merge (squash) October 29, 2025 04:28
@jkoritzinsky

jkoritzinsky commented Oct 30, 2025

Copy link
Copy Markdown
MemberAuthor

/ba-g WBT and deadletter unrelated. Sve failure tracked in #121189

@jkoritzinsky
jkoritzinsky merged commit d3dffb9 into dotnet:mainOct 30, 2025
146 of 155 checks passed
@jkoritzinsky
jkoritzinsky deleted the monitor-managed branch October 30, 2025 03:19
rhuijben
rhuijben reviewed Oct 30, 2025
View reviewed changes
Comment threadsrc/coreclr/debug/di/rsthread.cpp
// so we create an empty enumerator.
CordbBlockingObjectEnumerator* objEnum = new CordbBlockingObjectEnumerator(
GetProcess(),
new CorDebugBlockingObject[0],

@rhuijbenrhuijbenOct 30, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer deleted at the end of the function. It is 0 bytes, but...

@dotnet-maestrodotnet-maestroBot mentioned this pull request Oct 31, 2025
Closed
This was referenced Nov 3, 2025
Closed
Closed
@DrewScogginsDrewScoggins mentioned this pull request Nov 4, 2025
Closed
This was referenced Nov 4, 2025
Closed
Closed
Closed
@jkotasjkotas mentioned this pull request Nov 5, 2025
Closed
@dotnet-maestrodotnet-maestroBot mentioned this pull request Nov 6, 2025
Merged
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Nov 29, 2025
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jkotasjkotasjkotas approved these changes
Copilot code reviewCopilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments
@MichalStrehovskyMichalStrehovskyAwaiting requested review from MichalStrehovskyMichalStrehovsky is a code owner
@AaronRobinsonMSFTAaronRobinsonMSFTAwaiting requested review from AaronRobinsonMSFT
@eduardo-vpeduardo-vpAwaiting requested review from eduardo-vp
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@vitek-karasvitek-karasAwaiting requested review from vitek-karasvitek-karas is a code owner
@davidwrightondavidwrightonAwaiting requested review from davidwrighton
+1 more reviewer
@rhuijbenrhuijbenrhuijben left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@jkoritzinskyjkoritzinsky

Labels

area-VM-coreclrlinkable-frameworkIssues associated with delivering a linker friendly framework

Projects

None yet

Milestone

11.0.0

Development

Successfully merging this pull request may close these issues.

7 participants

@jkoritzinsky@jkotas@MihaZupan@MihuBot@rhuijben@AaronRobinsonMSFT