SaveState: Fix for race condition ("wait" didn't actually waited for 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.
This commit is contained in:
ghost
2015-09-26 17:59:27 +03:00
parent a91810ba3b
commit cd19d5392e
4 changed files with 66 additions and 3 deletions

View File

@ -108,6 +108,7 @@
<ClInclude Include="Network.h" />
<ClInclude Include="PcapFile.h" />
<ClInclude Include="Profiler.h" />
<ClInclude Include="ScopeGuard.h" />
<ClInclude Include="SDCardUtil.h" />
<ClInclude Include="SettingsHandler.h" />
<ClInclude Include="StringUtil.h" />

View File

@ -53,6 +53,7 @@
<ClInclude Include="Network.h" />
<ClInclude Include="PcapFile.h" />
<ClInclude Include="Profiler.h" />
<ClInclude Include="ScopeGuard.h" />
<ClInclude Include="SDCardUtil.h" />
<ClInclude Include="SettingsHandler.h" />
<ClInclude Include="StringUtil.h" />

View File

@ -0,0 +1,50 @@
// Copyright 2015 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include <functional>
namespace Common
{
class ScopeGuard final
{
public:
template<class Callable>
ScopeGuard(Callable&& finalizer) : m_finalizer(std::forward<Callable>(finalizer)) {}
ScopeGuard(ScopeGuard&& other) : m_finalizer(std::move(other.m_finalizer))
{
other.m_finalizer = nullptr;
}
~ScopeGuard()
{
Exit();
}
void Dismiss()
{
m_finalizer = nullptr;
}
void Exit()
{
if (m_finalizer)
{
m_finalizer(); // must not throw
m_finalizer = nullptr;
}
}
ScopeGuard(const ScopeGuard&) = delete;
void operator=(const ScopeGuard&) = delete;
private:
std::function<void()> m_finalizer;
};
} // Namespace Common