Use ConcurrentDictionary to avoid threading issues #104407
Merged
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
lilinus
reviewed
Jul 5, 2024
...ibraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/PropertyDescriptor.cs
Outdated
Show resolved
Hide resolved
AustinWise
reviewed
Jul 5, 2024
There was a problem hiding this comment.
You could potentially use features of the ConcurrentDictionary to avoid the need for a lock. See this gist: https://gist.github.com/AustinWise/92f293463124cdbf95e702946502b636
...ibraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/PropertyDescriptor.cs
Outdated
Show resolved
Hide resolved
| _valueChangedHandlers[component] = h; | ||
| } | ||
| else | ||
| lock (SyncObject) |
There was a problem hiding this comment.
Suggested change
| lock (SyncObject) | |
| while (true) | |
| { | |
| EventHandler? existingHandler; | |
| if (!_valueChangedHandlers.TryGetValue(component, out existingHandler)) | |
| { | |
| break; | |
| } | |
| EventHandler? replacementHandler = (EventHandler?)Delegate.Remove(existingHandler, handler); | |
| if (replacementHandler is null) | |
| { | |
| if (_valueChangedHandlers.TryRemove(new KeyValuePair<object, EventHandler?>(component, existingHandler))) | |
| { | |
| break; | |
| } | |
| } | |
| else | |
| { | |
| if (_valueChangedHandlers.TryUpdate(component, replacementHandler, existingHandler)) | |
| { | |
| break; | |
| } | |
| } | |
| } |
I intend for this to replace the entire lock block, but GitHub won't let me make that suggestion. See here for what it should look like: https://gist.github.com/AustinWise/92f293463124cdbf95e702946502b636#file-propertydescriptor-cs-L62
There was a problem hiding this comment.
I think using the lock as-is is more straightforward. Also, the Remove is not likely to be used as often.
3 tasks
jkotas
reviewed
Jul 5, 2024
...ibraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/PropertyDescriptor.cs
Outdated
Show resolved
Hide resolved
This reverts commit 8fc2719.
stephentoub
reviewed
Jul 7, 2024
...ibraries/System.ComponentModel.TypeConverter/src/System/ComponentModel/PropertyDescriptor.cs
Outdated
Show resolved
Hide resolved
stephentoub
reviewed
Jul 7, 2024
...tem.ComponentModel.TypeConverter/src/System/ComponentModel/ReflectTypeDescriptionProvider.cs
Outdated
Show resolved
Hide resolved
This was referenced Jul 16, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Address various threading issues including:
Fixes #104221
Fixes #103823
Fixes #102136
Local testing included running all tests in a loop 300x in both Release and Debug builds.
Linking here other threading issues fixed in this area fixed during 9.0:
#30024
#92394
#97179
#103265