diff --git a/CMakeLists.txt b/CMakeLists.txt index bcd937741a..0a134fcf70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2411,8 +2411,6 @@ add_library(${CoreLibName} ${CoreLinkType} Core/Screenshot.h Core/System.cpp Core/System.h - Core/ThreadPools.cpp - Core/ThreadPools.h Core/Util/AtracTrack.cpp Core/Util/AtracTrack.h Core/Util/AudioFormat.cpp diff --git a/Common/Thread/ThreadManager.cpp b/Common/Thread/ThreadManager.cpp index 547f13f75f..6153329115 100644 --- a/Common/Thread/ThreadManager.cpp +++ b/Common/Thread/ThreadManager.cpp @@ -24,6 +24,8 @@ const int MAX_CORES_TO_USE = 16; const int MIN_IO_BLOCKING_THREADS = 4; static constexpr size_t TASK_PRIORITY_COUNT = (size_t)TaskPriority::COUNT; +ThreadManager g_threadManager; + struct GlobalThreadContext { std::mutex mutex; std::deque compute_queue[TASK_PRIORITY_COUNT]; diff --git a/Core/Core.vcxproj b/Core/Core.vcxproj index c281c4ba59..fd23e717c5 100644 --- a/Core/Core.vcxproj +++ b/Core/Core.vcxproj @@ -1084,7 +1084,6 @@ - @@ -1470,7 +1469,6 @@ - diff --git a/Core/Core.vcxproj.filters b/Core/Core.vcxproj.filters index eb4f5f6c57..e3576f61a2 100644 --- a/Core/Core.vcxproj.filters +++ b/Core/Core.vcxproj.filters @@ -952,9 +952,6 @@ Core - - Core - Debugger\WebSocket @@ -2034,9 +2031,6 @@ Core - - Core - Debugger\WebSocket diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 1b49e0c11c..55269af1a5 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -22,6 +22,7 @@ #include #include "Common/Thread/ParallelLoop.h" +#include "Common/Thread/ThreadManager.h" #include "Core/CoreTiming.h" #include "Core/Debugger/MemBlockInfo.h" #include "Core/HLE/HLE.h" @@ -30,7 +31,6 @@ #include "Core/MemMapHelpers.h" #include "Core/Reporting.h" #include "Core/System.h" -#include "Core/ThreadPools.h" #include "Common/Serialize/Serializer.h" #include "Common/Serialize/SerializeFuncs.h" #include "Common/Serialize/SerializeMap.h" diff --git a/Core/ThreadPools.cpp b/Core/ThreadPools.cpp deleted file mode 100644 index 103856020a..0000000000 --- a/Core/ThreadPools.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "ThreadPools.h" - -ThreadManager g_threadManager; diff --git a/Core/ThreadPools.h b/Core/ThreadPools.h deleted file mode 100644 index efde2b9f47..0000000000 --- a/Core/ThreadPools.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "Common/Thread/ThreadManager.h" - -extern ThreadManager g_threadManager; diff --git a/GPU/Debugger/Record.cpp b/GPU/Debugger/Record.cpp index 67d03452c6..d36b0883b2 100644 --- a/GPU/Debugger/Record.cpp +++ b/GPU/Debugger/Record.cpp @@ -26,6 +26,7 @@ #include "Common/CommonTypes.h" #include "Common/File/FileUtil.h" +#include "Common/Thread/ThreadManager.h" #include "Common/Thread/ParallelLoop.h" #include "Common/Log.h" #include "Common/StringUtils.h" @@ -36,7 +37,6 @@ #include "Core/HLE/sceDisplay.h" #include "Core/MemMap.h" #include "Core/System.h" -#include "Core/ThreadPools.h" #include "GPU/Common/GPUDebugInterface.h" #include "GPU/GPUCommon.h" #include "GPU/GPUState.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 65d12514bd..959de71620 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -84,6 +84,7 @@ #include "Common/OSVersion.h" #include "Common/GPU/ShaderTranslation.h" #include "Common/VR/PPSSPPVR.h" +#include "Common/Thread/ThreadManager.h" #include "Core/ControlMapper.h" #include "Core/Config.h" @@ -109,7 +110,6 @@ #include "Core/Util/AudioFormat.h" #include "Core/WebServer.h" #include "Core/TiltEventProcessor.h" -#include "Core/ThreadPools.h" #include "GPU/GPUCommon.h" #include "GPU/Common/PresentationCommon.h" diff --git a/UWP/CoreUWP/CoreUWP.vcxproj b/UWP/CoreUWP/CoreUWP.vcxproj index c88ae1961d..4dd08eb4c7 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj +++ b/UWP/CoreUWP/CoreUWP.vcxproj @@ -331,7 +331,6 @@ - @@ -631,7 +630,6 @@ - @@ -1042,4 +1040,4 @@ - \ No newline at end of file + diff --git a/UWP/CoreUWP/CoreUWP.vcxproj.filters b/UWP/CoreUWP/CoreUWP.vcxproj.filters index 8426b68001..8ccae0e868 100644 --- a/UWP/CoreUWP/CoreUWP.vcxproj.filters +++ b/UWP/CoreUWP/CoreUWP.vcxproj.filters @@ -1191,7 +1191,6 @@ Ext\libzip - @@ -1912,7 +1911,6 @@ Ext\jpge - @@ -1966,4 +1964,4 @@ Ext\gason - \ No newline at end of file + diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 405e2345eb..c18a9aa3e7 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -619,7 +619,6 @@ EXEC_AND_LIB_FILES := \ $(SRC)/Core/Screenshot.cpp \ $(SRC)/Core/System.cpp \ $(SRC)/Core/TiltEventProcessor.cpp \ - $(SRC)/Core/ThreadPools.cpp \ $(SRC)/Core/WebServer.cpp \ $(SRC)/Core/Debugger/Breakpoints.cpp \ $(SRC)/Core/Debugger/DisassemblyManager.cpp \ diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 4c4d836116..977dc8202e 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -825,7 +825,6 @@ SOURCES_CXX += \ $(COREDIR)/SaveState.cpp \ $(COREDIR)/Screenshot.cpp \ $(COREDIR)/System.cpp \ - $(COREDIR)/ThreadPools.cpp \ $(COREDIR)/Util/AtracTrack.cpp \ $(COREDIR)/Util/BlockAllocator.cpp \ $(COREDIR)/Util/MemStick.cpp \