Avoid deadlocks in multi-threaded management of the C# script map #99539
+103
−51
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RandomShaper
added
bug
topic:dotnet
cherrypick:4.3
RandomShaper
commented
Nov 22, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Outdated
Show resolved
Hide resolved
RandomShaper
force-pushed
the
fix_dotnet_rl_deadlock
branch
3 times, most recently
from
aad25f5 to
5c94f0b
Compare
raulsntos
reviewed
Dec 1, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.cs
Show resolved
Hide resolved
raulsntos
reviewed
Dec 1, 2024
modules/mono/glue/GodotSharp/GodotSharp/Core/Bridge/ScriptManagerBridge.types.cs
Outdated
Show resolved
Hide resolved
RandomShaper
force-pushed
the
fix_dotnet_rl_deadlock
branch
from
5c94f0b to
f8f5505
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The idea here is that using a read-write locking instead of all-or-nothing reduces the chances of a deadlock.
I'm not sure if this covers every possibility of such, because the interaction between, say, multiple resource loading threads instantiating C# scripts and the .NET module can be complex. All I can say is that this at least stops me from being able to reproduce the issue with the MRP provided.
Note for reviewers: Disable whitespace diff as one of the methods has a change of indentation level that makes the patch look more complex than it actually is.
Fixes #99128.
Fixes #99839 (I haven't been able to reproduce the issue with the MRP, even after modifying it to effectively use multiple loader threads; however, it's extremely likely that the issue the reporter found is fixed by this PR).