Report deadlocked thread names in failures to stop emulation #9865
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
elad335
commented
Feb 28, 2021
| { | ||
| atomic_wait_engine::raw_notify(0, get_native_id()); |
There was a problem hiding this comment.
I took the liberaty to remove this hack as I think all thread code paths are CELL_OK now.
elad335
commented
Feb 28, 2021
Utilities/Thread.cpp
Outdated
| @@ -2336,9 +2336,8 @@ bool thread_base::join(bool dtor) const | |||
| } | |||
|
|
|||
| // Hacked for too sleepy threads (1ms) TODO: make sure it's unneeded and remove | |||
| const auto timeout = dtor && Emu.IsStopped() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf; | |||
| const auto timeout = dtor && !thread_ctrl::get_current() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf; | |||
There was a problem hiding this comment.
Can you just keep this line the same? It does't stand in the way of the declared purpose of the PR. On the other hand, checking get_current() is a very weird one.
|
PR name confuses me as hell. Their names were always reported as I remember. |
|
Not when watchdog times out such as in https://cdn.discordapp.com/attachments/277227681836302338/815638772644446269/unknown.png |
Nekotekina
requested changes
Feb 28, 2021
Utilities/Thread.cpp
Outdated
| @@ -2336,9 +2336,8 @@ bool thread_base::join(bool dtor) const | |||
| } | |||
|
|
|||
| // Hacked for too sleepy threads (1ms) TODO: make sure it's unneeded and remove | |||
| const auto timeout = dtor && Emu.IsStopped() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf; | |||
| const auto timeout = dtor && !thread_ctrl::get_current() ? atomic_wait_timeout{1'000'000} : atomic_wait_timeout::inf; | |||
There was a problem hiding this comment.
Can you just keep this line the same? It does't stand in the way of the declared purpose of the PR. On the other hand, checking get_current() is a very weird one.
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.
Finally report which threads were failing to terminate at Emu.Stop().