archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

FifoRecorder: remove use of volatile

Browse source
This commit is contained in:
Michael M 2017-09-14 11:54:05 -07:00
parent 5576af061b
commit a47ce0d625
2 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View file

@ -6,7 +6,6 @@
#include <algorithm> #include <algorithm>
#include <cstring> #include <cstring>
#include <mutex>
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/Thread.h" #include "Common/Thread.h"
@ -16,24 +15,16 @@
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
static FifoRecorder instance; static FifoRecorder instance;
static std::recursive_mutex sMutex;
FifoRecorder::FifoRecorder() = default; FifoRecorder::FifoRecorder() = default;
FifoRecorder::~FifoRecorder()
{
m_IsRecording = false;
}
void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb) void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
{ {
std::lock_guard<std::recursive_mutex> lk(sMutex); std::lock_guard<std::recursive_mutex> lk(m_mutex);
delete m_File;
FifoAnalyzer::Init(); FifoAnalyzer::Init();
m_File = new FifoDataFile; m_File = std::make_unique<FifoDataFile>();
// TODO: This, ideally, would be deallocated when done recording. // TODO: This, ideally, would be deallocated when done recording.
// However, care needs to be taken since global state // However, care needs to be taken since global state
@ -68,6 +59,7 @@ void FifoRecorder::StartRecording(s32 numFrames, CallbackFunc finishedCb)
void FifoRecorder::StopRecording() void FifoRecorder::StopRecording()
{ {
std::lock_guard<std::recursive_mutex> lk(m_mutex);
m_RequestedRecordingEnd = true; m_RequestedRecordingEnd = true;
} }
@ -95,7 +87,7 @@ void FifoRecorder::WriteGPCommand(const u8* data, u32 size)
m_CurrentFrame.fifoData = m_FifoData; m_CurrentFrame.fifoData = m_FifoData;
{ {
std::lock_guard<std::recursive_mutex> lk(sMutex); std::lock_guard<std::recursive_mutex> lk(m_mutex);
// Copy frame to file // Copy frame to file
// The file will be responsible for freeing the memory allocated for each frame's fifoData // The file will be responsible for freeing the memory allocated for each frame's fifoData
@ -153,7 +145,7 @@ void FifoRecorder::UseMemory(u32 address, u32 size, MemoryUpdate::Type type, boo
void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd) void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
{ {
// m_IsRecording is assumed to be true at this point, otherwise this function would not be called // m_IsRecording is assumed to be true at this point, otherwise this function would not be called
std::lock_guard<std::recursive_mutex> lk(sMutex); std::lock_guard<std::recursive_mutex> lk(m_mutex);
m_FrameEnded = true; m_FrameEnded = true;
@ -196,7 +188,7 @@ void FifoRecorder::EndFrame(u32 fifoStart, u32 fifoEnd)
void FifoRecorder::SetVideoMemory(const u32* bpMem, const u32* cpMem, const u32* xfMem, void FifoRecorder::SetVideoMemory(const u32* bpMem, const u32* cpMem, const u32* xfMem,
const u32* xfRegs, u32 xfRegsSize, const u8* texMem) const u32* xfRegs, u32 xfRegsSize, const u8* texMem)
{ {
std::lock_guard<std::recursive_mutex> lk(sMutex); std::lock_guard<std::recursive_mutex> lk(m_mutex);
if (m_File) if (m_File)
{ {

19
Source/Core/Core/FifoPlayer/FifoRecorder.h
View file

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <memory>
#include <mutex>
#include <vector> #include <vector>
#include "Core/FifoPlayer/FifoDataFile.h" #include "Core/FifoPlayer/FifoDataFile.h"
@ -14,12 +16,11 @@ public:
typedef void (*CallbackFunc)(void); typedef void (*CallbackFunc)(void);
FifoRecorder(); FifoRecorder();
~FifoRecorder();
void StartRecording(s32 numFrames, CallbackFunc finishedCb); void StartRecording(s32 numFrames, CallbackFunc finishedCb);
void StopRecording(); void StopRecording();
FifoDataFile* GetRecordedFile() const { return m_File; } FifoDataFile* GetRecordedFile() const { return m_File.get(); }
// Called from video thread // Called from video thread
// Must write one full GP command at a time // Must write one full GP command at a time
@ -46,15 +47,15 @@ public:
private: private:
// Accessed from both GUI and video threads // Accessed from both GUI and video threads
std::recursive_mutex m_mutex;
// True if video thread should send data // True if video thread should send data
volatile bool m_IsRecording = false; bool m_IsRecording = false;
// True if m_IsRecording was true during last frame // True if m_IsRecording was true during last frame
volatile bool m_WasRecording = false; bool m_WasRecording = false;
volatile bool m_RequestedRecordingEnd = false; bool m_RequestedRecordingEnd = false;
volatile s32 m_RecordFramesRemaining = 0; s32 m_RecordFramesRemaining = 0;
volatile CallbackFunc m_FinishedCb = nullptr; CallbackFunc m_FinishedCb = nullptr;
std::unique_ptr<FifoDataFile> m_File;
FifoDataFile* volatile m_File = nullptr;
// Accessed only from video thread // Accessed only from video thread