Open
Conversation
Semver Impact of This PR🟢 Patch (bug fixes) 📋 Changelog PreviewThis is how your changes will appear in the changelog. Bug Fixes 🐛
🤖 This preview updates automatically when you update the PR. |
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
timfish
force-pushed
the
timfish/fix/deadlock
branch
from
9de613f to
6fcbd72
Compare
JPeer264
approved these changes
Apr 14, 2026
Member
JPeer264
left a comment
JPeer264
left a comment
There was a problem hiding this comment.
I have absolutely no clue about C++, but I trust you on this one
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This PR resolves the deadlock caused by
CaptureStackTracesholding a global mutex while waiting on futures, which preventedThreadPollfrom acquiring the same mutex to update thread data.The fix introduces a two-mutex architecture:
threads_map_mutexprotects the map structure during iteration/insertion/deletion, while eachThreadInfohas its own mutex protecting only its mutable data (poll_state,last_seen). Additionally,async_storeis now wrapped inshared_ptrto prevent use-after-free when async tasks outlive the thread's map entry, andCaptureStackTracenow includes a 5-second timeout to handle cases where isolates never process the interrupt request. The futures vector is moved outside the lock scope, ensuring the map lock is released before callingfut.get().