Get rid of our own silly reimplementation of std::thread

tianmei · Feb 27, 2017 · 50be4e7 · 50be4e7
1 parent 5de190a
commit 50be4e7
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 355 deletions.
diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp
@@ -15,8 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <thread>
+
 #include "i18n/i18n.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 
 #include "Common/ChunkFile.h"

diff --git a/Core/Dialog/PSPSaveDialog.h b/Core/Dialog/PSPSaveDialog.h
@@ -17,7 +17,8 @@
 
 #pragma once
 
-#include "thread/thread.h"
+#include <thread>
+
 #include "base/mutex.h"
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/Dialog/SavedataParam.h"

diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp
@@ -15,8 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <string.h>
-#include "thread/thread.h"
+#include <cstring>
+#include <thread>
+#include <algorithm>
+
 #include "thread/threadutil.h"
 #include "base/timeutil.h"
 #include "Core/FileLoaders/CachingFileLoader.h"

diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp
@@ -15,9 +15,10 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include <string.h>
+#include <algorithm>
+#include <thread>
+#include <cstring>
 #include "base/timeutil.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "Core/FileLoaders/RamCachingFileLoader.h"
 

diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
@@ -17,9 +17,10 @@
 
 #pragma once
 
+#include <thread>
+
 #include "base/timeutil.h"
 #include "base/mutex.h"
-#include "thread/thread.h"
 #include "net/resolve.h"
 #include "Common/ChunkFile.h"
 

diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
@@ -17,8 +17,8 @@
 
 #include <cstdlib>
 #include <set>
+#include <thread>
 
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "profiler/profiler.h"
 

diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp
@@ -28,11 +28,11 @@
 
 #include <cstdlib>
 #include <functional>
+#include <thread>
 
 #include "base/basictypes.h"
 #include "base/mutex.h"
 #include "profiler/profiler.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "Common/Log.h"
 #include "Core/Config.h"

diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
@@ -15,6 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <thread>
+
 #include "Core/Reporting.h"
 
 #include "Common/CPUDetect.h"
@@ -38,7 +40,6 @@
 
 #include "base/stringutil.h"
 #include "base/buffer.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "file/zip_read.h"
 

diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
@@ -17,11 +17,11 @@
 
 #include <algorithm>
 #include <vector>
+#include <thread>
 
 #include "base/mutex.h"
 #include "base/timeutil.h"
 #include "i18n/i18n.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 
 #include "Common/FileUtil.h"

diff --git a/Core/System.cpp b/Core/System.cpp
@@ -24,9 +24,9 @@
 #include <string>
 #include <codecvt>
 #endif
+#include <thread>
 
 #include "math/math_util.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "base/mutex.h"
 #include "util/text/utf8.h"

diff --git a/Core/Util/GameManager.cpp b/Core/Util/GameManager.cpp
@@ -18,14 +18,14 @@
 #include <algorithm>
 #include <set>
 #include <cstring>
+#include <thread>
 
 #include "file/file_util.h"
 #ifdef SHARED_LIBZIP
 #include <zip.h>
 #else
 #include "ext/libzip/zip.h"
 #endif
-#include "thread/thread.h"
 #include "util/text/utf8.h"
 
 #include "Common/Log.h"

diff --git a/Core/Util/GameManager.h b/Core/Util/GameManager.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "thread/thread.h"
+#include <thread>
 #include "net/http_client.h"
 
 class GameManager {

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
@@ -34,6 +34,7 @@
 #include <algorithm>
 #endif
 #include <memory>
+#include <thread>
 
 #if defined(_WIN32)
 #include "Windows/DSoundStream.h"
@@ -46,7 +47,6 @@
 #include "base/NativeApp.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
-#include "thread/thread.h"
 #include "net/http_client.h"
 #include "gfx_es2/draw_text.h"
 #include "gfx_es2/gpu_features.h"

diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
@@ -15,6 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+#include <algorithm>
+#include <thread>
+
 #include "base/timeutil.h"
 #include "ext/vjson/json.h"
 #include "file/fd_util.h"
@@ -23,7 +26,6 @@
 #include "net/http_server.h"
 #include "net/resolve.h"
 #include "net/sinks.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "Common/Common.h"
 #include "Common/FileUtil.h"

diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
@@ -16,10 +16,10 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <list>
+#include <thread>
 #include <memory>
 #include "base/mutex.h"
 #include "input/input_state.h"
-#include "thread/thread.h"
 #include "thread/threadutil.h"
 #include "Core/Config.h"
 #include "Core/Host.h"

diff --git a/Windows/W32Util/ShellUtil.cpp b/Windows/W32Util/ShellUtil.cpp
@@ -5,8 +5,8 @@
 #include "stdafx.h"
 
 #include <functional>
+#include <thread>
 
-#include "thread/thread.h"
 #include "util/text/utf8.h"
 #include "ShellUtil.h"
 #include "CommDlg.h"

diff --git a/Windows/W32Util/ShellUtil.h b/Windows/W32Util/ShellUtil.h
@@ -2,8 +2,7 @@
 
 #include <string>
 #include <vector>
-#include "thread/thread.h"
-
+#include <thread>
 
 namespace W32Util
 {

diff --git a/ext/native/native.vcxproj b/ext/native/native.vcxproj
@@ -273,7 +273,6 @@
     <ClInclude Include="thin3d\thin3d.h" />
     <ClInclude Include="thread\executor.h" />
     <ClInclude Include="thread\prioritizedworkqueue.h" />
-    <ClInclude Include="thread\thread.h" />
     <ClInclude Include="thread\threadpool.h" />
     <ClInclude Include="thread\threadutil.h" />
     <ClInclude Include="ui\screen.h" />

diff --git a/ext/native/native.vcxproj.filters b/ext/native/native.vcxproj.filters
@@ -176,9 +176,6 @@
     <ClInclude Include="thread\prioritizedworkqueue.h">
       <Filter>thread</Filter>
     </ClInclude>
-    <ClInclude Include="thread\thread.h">
-      <Filter>thread</Filter>
-    </ClInclude>
     <ClInclude Include="thread\threadutil.h">
       <Filter>thread</Filter>
     </ClInclude>

diff --git a/ext/native/net/http_client.h b/ext/native/net/http_client.h
@@ -2,10 +2,10 @@
 
 #include <functional>
 #include <memory>
+#include <thread>
 
 #include "base/basictypes.h"
 #include "base/buffer.h"
-#include "thread/thread.h"
 
 #ifdef _WIN32
 #ifndef NOMINMAX

diff --git a/ext/native/thread/prioritizedworkqueue.cpp b/ext/native/thread/prioritizedworkqueue.cpp
@@ -1,8 +1,8 @@
 #include <functional>
+#include <thread>
 
 #include "base/logging.h"
 #include "base/timeutil.h"
-#include "thread/thread.h"
 #include "thread/prioritizedworkqueue.h"
 
 PrioritizedWorkQueue::~PrioritizedWorkQueue() {