adjustments to core suspender #5075
Open
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
|
with the last commit this now does resolve #5074 i've validated it on windows but needs testing on linux test procedure:
|
|
@dhthwy has confirmed that this works on linux, so i'm releasing it for review |
|
thanks again to @NicksWorld for their invaluable help on this PR |
myk002
added a commit
to myk002/dfhack
that referenced
this pull request
Dec 6, 2024
to reduce danger of deadlocking will be reverted in DFHack#5075
NicksWorld
reviewed
Dec 12, 2024
this is an attempted step to improve semantics around core suspenders. this does not actually resolve DFHack#5074 but it is intended as a step toward doing so
this switches the core lock to a recursive timed mutex, uses a `try_lock_for` in `CoreSuspenderBase` and changes `help_helper` and `get_commands` over to using conditional locks to avoid a hang in the event that a core lock cannot be acquired in these methods i also moved some repeated code into protected/private methods in both `CoreSuspenderBase` and `CoreSuspender` to mitigate DRY, which also massively improves readability h/t to @NicksWorld for their help in figuring out the required semantics Co-Authored-By: Nicholas McDaniel <[email protected]>
Drastically simplify CoreSuspender API: * remove access to state manipulation * add ConditionalCoreSuspender subclass for conditional locks * fix various errors around use of an explicit core argument when creating a CoreSuspender
to satisfy gcc's order warning i will shortly submit a PR to add `/w15038` to the msvc configuration so msvc will also catch these warnings going forward
|
The last batch of changes drastically simplify the |
removed the local `isLocked` member from `CoreSuspenderBase` as it is redundant with `owns_lock()` from `std::unique_lock` h/t to @NicksWorld for pointing this out Co-Authored-By: Nicholas McDaniel <[email protected]>
myk002
reviewed
Dec 18, 2024
no point in calling `owns_lock` twice
myk002
approved these changes
Dec 18, 2024
|
I'm not certain of the full effect of this change, but the changes look reasonable to merge for practical testing |
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.
this is an attempted step to improve semantics around core suspenders. this does not actually resolve #5074 but it is intended as a step toward doing so