Merge pull request #796 from lioncash/threading

Common: Get rid of StdConditionVariable, StdMutex, and StdThread.
dolphin-emu · Aug 17, 2014 · ac0ac18 · ac0ac18
2 parents 2270c3e + 1b92c68
commit ac0ac18
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 851 deletions.
diff --git a/Source/Core/AudioCommon/AOSoundStream.h b/Source/Core/AudioCommon/AOSoundStream.h
@@ -4,10 +4,11 @@
 
 #pragma once
 
+#include <mutex>
+#include <thread>
+
 #include "AudioCommon/SoundStream.h"
 #include "Common/Event.h"
-#include "Common/StdMutex.h"
-#include "Common/StdThread.h"
 
 #if defined(HAVE_AO) && HAVE_AO
 #include <ao/ao.h>

diff --git a/Source/Core/AudioCommon/DSoundStream.cpp b/Source/Core/AudioCommon/DSoundStream.cpp
@@ -3,11 +3,11 @@
 // Refer to the license.txt file included.
 
 #include <cmath>
+#include <thread>
 #include <Windows.h>
 
 #include "AudioCommon/AudioCommon.h"
 #include "AudioCommon/DSoundStream.h"
-#include "Common/StdThread.h"
 #include "Common/Thread.h"
 
 bool DSound::CreateBuffer()

diff --git a/Source/Core/AudioCommon/DSoundStream.h b/Source/Core/AudioCommon/DSoundStream.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <thread>
+
 #include "AudioCommon/SoundStream.h"
 #include "Common/Event.h"
-#include "Common/StdThread.h"
 
 #ifdef _WIN32
 #include <Windows.h>

diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <mutex>
 #include <string>
 
 #include "AudioCommon/WaveFile.h"
-#include "Common/StdMutex.h"
 
 // 16 bit Stereo
 #define MAX_SAMPLES     (1024 * 2) // 64ms

diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp
@@ -2,10 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <thread>
+
 #include "AudioCommon/aldlist.h"
 #include "AudioCommon/DPL2Decoder.h"
 #include "AudioCommon/OpenALStream.h"
-#include "Common/StdThread.h"
 #include "Common/Thread.h"
 
 #if defined HAVE_OPENAL && HAVE_OPENAL

diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <thread>
+
 #include "AudioCommon/SoundStream.h"
 #include "Common/Event.h"
-#include "Common/StdThread.h"
 #include "Core/Core.h"
 #include "Core/HW/AudioInterface.h"
 #include "Core/HW/SystemTimers.h"

diff --git a/Source/Core/AudioCommon/OpenSLESStream.h b/Source/Core/AudioCommon/OpenSLESStream.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <thread>
+
 #include "AudioCommon/SoundStream.h"
 #include "Common/Event.h"
-#include "Common/StdThread.h"
 
 class OpenSLESStream final : public SoundStream
 {

diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
@@ -55,6 +55,7 @@
     <ClInclude Include="FileSearch.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="Flag.h" />
     <ClInclude Include="FPURoundMode.h" />
     <ClInclude Include="GekkoDisassembler.h" />
     <ClInclude Include="Hash.h" />
@@ -69,10 +70,7 @@
     <ClInclude Include="PcapFile.h" />
     <ClInclude Include="SDCardUtil.h" />
     <ClInclude Include="SettingsHandler.h" />
-    <ClInclude Include="StdConditionVariable.h" />
     <ClInclude Include="StdMakeUnique.h" />
-    <ClInclude Include="StdMutex.h" />
-    <ClInclude Include="StdThread.h" />
     <ClInclude Include="StringUtil.h" />
     <ClInclude Include="SymbolDB.h" />
     <ClInclude Include="SysConf.h" />

diff --git a/Source/Core/Common/Common.vcxproj.filters b/Source/Core/Common/Common.vcxproj.filters
@@ -29,6 +29,7 @@
     <ClInclude Include="FileSearch.h" />
     <ClInclude Include="FileUtil.h" />
     <ClInclude Include="FixedSizeQueue.h" />
+    <ClInclude Include="Flag.h" />
     <ClInclude Include="FPURoundMode.h" />
     <ClInclude Include="Hash.h" />
     <ClInclude Include="IniFile.h" />
@@ -42,10 +43,7 @@
     <ClInclude Include="PcapFile.h" />
     <ClInclude Include="SDCardUtil.h" />
     <ClInclude Include="SettingsHandler.h" />
-    <ClInclude Include="StdConditionVariable.h" />
     <ClInclude Include="StdMakeUnique.h" />
-    <ClInclude Include="StdMutex.h" />
-    <ClInclude Include="StdThread.h" />
     <ClInclude Include="StringUtil.h" />
     <ClInclude Include="SymbolDB.h" />
     <ClInclude Include="SysConf.h" />

diff --git a/Source/Core/Common/Event.h b/Source/Core/Common/Event.h
@@ -16,9 +16,10 @@
 #include <concrt.h>
 #endif
 
+#include <condition_variable>
+#include <mutex>
+
 #include "Common/Flag.h"
-#include "Common/StdConditionVariable.h"
-#include "Common/StdMutex.h"
 
 namespace Common {
 

diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
@@ -6,11 +6,11 @@
 
 #include <cstdarg>
 #include <fstream>
+#include <mutex>
 #include <set>
 #include <string>
 
 #include "Common/Common.h"
-#include "Common/StdMutex.h"
 
 #define MAX_MESSAGES 8000
 #define MAX_MSGLEN  1024

diff --git a/Source/Core/Common/StdConditionVariable.h b/Source/Core/Common/StdConditionVariable.h