mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-21 05:09:34 -06:00
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:
@ -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" />
|
||||
|
@ -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" />
|
||||
|
50
Source/Core/Common/ScopeGuard.h
Normal file
50
Source/Core/Common/ScopeGuard.h
Normal 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
|
Reference in New Issue
Block a user