SaveState: Fix for race condition in SaveAs(...) #3095
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
| @@ -280,8 +281,17 @@ struct CompressAndDumpState_args | |||
| static void CompressAndDumpState(CompressAndDumpState_args save_args) | |||
| { | |||
| std::lock_guard<std::mutex> lk(*save_args.buffer_mutex); | |||
| if (!save_args.wait) | |||
|
|
|||
| auto onExit= wxMakeGuard([]() | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
void-ghost
force-pushed
the
savestate_race_condition_fix
branch
from
af3388e
to
c252645
Compare
|
@dolphin-emu-bot rebuild |
| template<class Callable> | ||
| ScopeGuard(Callable && finalizer) : m_finalizer(std::forward<Callable>(finalizer)) {} | ||
|
|
||
| ScopeGuard(ScopeGuard && other) : m_finalizer(std::move(other.m_finalizer)) |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
ScopeGuard.h also needs to be added to the vcxproj file in Common. |
void-ghost
force-pushed
the
savestate_race_condition_fix
branch
4 times, most recently
from
30b3f78
to
173df73
Compare
| @@ -280,8 +281,13 @@ struct CompressAndDumpState_args | |||
| static void CompressAndDumpState(CompressAndDumpState_args save_args) | |||
| { | |||
| std::lock_guard<std::mutex> lk(*save_args.buffer_mutex); | |||
| if (!save_args.wait) | |||
|
|
|||
| Common::ScopeGuard on_exit([]() | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
void-ghost
force-pushed
the
savestate_race_condition_fix
branch
from
173df73
to
bc53464
Compare
|
|
||
| //By creating ScopeGuard instance we ensure that g_compressAndDumpStateSyncEvent.Set() | ||
| //will be called then we leave this function, even if it's because of exception being thrown. | ||
| //Both ScopeGuard' and IOFile's finalization occur at respective object destruction time. |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
void-ghost
force-pushed
the
savestate_race_condition_fix
branch
2 times, most recently
from
7916b99
to
aceba9e
Compare
…file to flush/close). g_compressAndDumpStateSyncEvent was Set() before destruction of file object (i.e. before flushing changes and closing file). Also, adds Common::ScopeGuard wrapper for RAII.
void-ghost
force-pushed
the
savestate_race_condition_fix
branch
from
aceba9e
to
cd19d53
Compare
|
LGTM. |
shuffle2
added a commit
that referenced
this pull request
Oct 4, 2015
SaveState: Fix for race condition in SaveAs(...)
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.
"wait" didn't actually waited for file to flush/close. That sometimes produced savestates with partial data or wrong (zeroed) gameId.
g_compressAndDumpStateSyncEvent.Set() was called before destruction of file object (i.e. before flushing changes and closing file). I've used RAII to correct that.