[release/dev17.10] Fix hang on solution close #10033
Merged
Conversation
This file contains hidden or 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
There are scenarios on 17.10p2 where my recent changes to make `FallbackProjectManager` use the dispatcher for project snapshot manager changes can cause a dead lock. The problem occurs when dynamic file info is updated on the dispatcher thread. Roslyn will then call `GetDynamicFileInfoAsync(...)` on the dispatcher thread and block on the result. `GetDynamicFileInfoAsync(...)` calls into `FallbackProjectManager.DynamicFileAddedAsync(...)`, which attempts to make changes to the project snapshot manager using the dispatcher. However, because the dispatcher thread is blocked, it can never make progress to newly queued task and hangs. This is a small change to `FallbackProjectManager` to apply the project snapshot manager changes directly if it's running on the dispatcher thread. Otherwise, it rusn the change on the dispatcher.
davidwengier
approved these changes
Mar 6, 2024
Comment on lines
-121
to
+117
| .ConfigureAwait(false); | ||
| if (_dispatcher.IsDispatcherThread) |
Member
There was a problem hiding this comment.
Should this logic just be moved into RunOnDispatcherThread ?
Member
Author
There was a problem hiding this comment.
100%! But I'm just making a small change for the 17.10p2 QB. I'll have a proper PR that updates dispatcher on main up shortly.
ryzngard
approved these changes
Mar 6, 2024
Contributor
ryzngard
left a comment
ryzngard
left a comment
There was a problem hiding this comment.
Would like to see this on the dispatcher itself. Alternatively, could we use some form of JTF for this?
Member
Author
Yup, it'll be on dispatcher in main. I just didn't want to make a more impactful change on the release branch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1980614/
There are scenarios on 17.10p2 where my recent changes to make
FallbackProjectManageruse the dispatcher for project snapshot manager changes can cause a dead lock. The problem occurs when dynamic file info is updated on the dispatcher thread. Roslyn will then callGetDynamicFileInfoAsync(...)on the dispatcher thread and block on the result.GetDynamicFileInfoAsync(...)calls intoFallbackProjectManager.DynamicFileAddedAsync(...), which attempts to make changes to the project snapshot manager using the dispatcher. However, because the dispatcher thread is blocked, it can never make progress to newly queued task and hangs.This is a small change to
FallbackProjectManagerto apply the project snapshot manager changes directly if it's running on the dispatcher thread. Otherwise, it runs the change on the dispatcher.