Merge pull request #13288 from hrydgard/move-timeutil

Move timeutil to Common. (Experiment to see how much work it is to move these).
hrydgard · Aug 15, 2020 · 80aa527 · 80aa527
2 parents a5b6f8c + d3d90a1
commit 80aa527
Show file tree

Hide file tree

Showing 83 changed files with 137 additions and 141 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -462,6 +462,8 @@ add_library(Common STATIC
 	Common/ThreadSafeList.h
 	Common/Timer.cpp
 	Common/Timer.h
+	Common/TimeUtil.cpp
+	Common/TimeUtil.h
 )
 
 add_subdirectory(ext)
@@ -938,8 +940,6 @@ add_library(native STATIC
 	ext/native/base/linked_ptr.h
 	ext/native/base/stringutil.cpp
 	ext/native/base/stringutil.h
-	ext/native/base/timeutil.cpp
-	ext/native/base/timeutil.h
 	ext/native/data/base64.cpp
 	ext/native/data/base64.h
 	ext/native/data/compression.cpp

diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
@@ -417,6 +417,7 @@
     <ClInclude Include="ThreadSafeList.h" />
     <ClInclude Include="Thunk.h" />
     <ClInclude Include="Timer.h" />
+    <ClInclude Include="TimeUtil.h" />
     <ClInclude Include="Vulkan\VulkanContext.h" />
     <ClInclude Include="Vulkan\VulkanDebug.h" />
     <ClInclude Include="Vulkan\VulkanImage.h" />
@@ -513,6 +514,7 @@
     <ClCompile Include="ThreadPools.cpp" />
     <ClCompile Include="Thunk.cpp" />
     <ClCompile Include="Timer.cpp" />
+    <ClCompile Include="TimeUtil.cpp" />
     <ClCompile Include="Vulkan\VulkanContext.cpp" />
     <ClCompile Include="Vulkan\VulkanDebug.cpp" />
     <ClCompile Include="Vulkan\VulkanImage.cpp" />

diff --git a/ext/native/base/timeutil.cpp → Common/TimeUtil.cpp b/ext/native/base/timeutil.cpp → Common/TimeUtil.cpp
@@ -1,7 +1,7 @@
 #include <cstdio>
 
 #include "base/basictypes.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 #ifdef _WIN32
 #include <windows.h>

diff --git a/ext/native/base/timeutil.h → Common/TimeUtil.h b/ext/native/base/timeutil.h → Common/TimeUtil.h
diff --git a/Common/Vulkan/VulkanMemory.cpp b/Common/Vulkan/VulkanMemory.cpp
@@ -18,10 +18,10 @@
 // Additionally, Common/Vulkan/* , including this file, are also licensed
 // under the public domain.
 
-#include "base/timeutil.h"
 #include "math/math_util.h"
 
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "Common/Vulkan/VulkanMemory.h"
 
 VulkanPushBuffer::VulkanPushBuffer(VulkanContext *vulkan, size_t size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memoryPropertyMask)

diff --git a/Core/Core.cpp b/Core/Core.cpp
@@ -24,7 +24,7 @@
 
 #include "base/NativeApp.h"
 #include "base/display.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "thread/threadutil.h"
 #include "profiler/profiler.h"
 

diff --git a/Core/FileLoaders/CachingFileLoader.cpp b/Core/FileLoaders/CachingFileLoader.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 
 #include "thread/threadutil.h"
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "Core/FileLoaders/CachingFileLoader.h"
 
 // Takes ownership of backend.

diff --git a/Core/FileLoaders/RamCachingFileLoader.cpp b/Core/FileLoaders/RamCachingFileLoader.cpp
@@ -20,8 +20,8 @@
 #include <cstring>
 #include <cstdlib>
 
-#include "base/timeutil.h"
 #include "thread/threadutil.h"
+#include "Common/TimeUtil.h"
 #include "Core/FileLoaders/RamCachingFileLoader.h"
 
 #include "Common/Log.h"

diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
@@ -20,11 +20,11 @@
 #include <vector>
 #include <string>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/Log.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"

diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
@@ -31,17 +31,20 @@
 #endif
 
 #include <cstring>
-#include "util/text/parsers.h"
+
+#include "i18n/i18n.h"
 #include "thread/threadutil.h"
+#include "util/text/parsers.h"
+
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/sceKernelInterrupt.h"
 #include "Core/HLE/sceKernelThread.h"
 #include "Core/HLE/sceKernelMemory.h"
 #include "Core/Instance.h"
 #include "proAdhoc.h" 
-#include "i18n/i18n.h"
 
 uint16_t portOffset;
 uint32_t minSocketTimeoutUS;

diff --git a/Core/HLE/proAdhoc.h b/Core/HLE/proAdhoc.h
@@ -41,7 +41,6 @@
 #include <thread>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "net/resolve.h"
 #include "Common/Serialize/Serializer.h"
 

diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp
@@ -43,14 +43,16 @@
 #include <fcntl.h>
 #include <errno.h>
 //#include <sqlite3.h>
+
+#include "i18n/i18n.h"
 #include "thread/threadutil.h"
+
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Util/PortManager.h"
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/HLE/proAdhocServer.h"
-#include "i18n/i18n.h"
-
 
 // User Count
 uint32_t _db_user_count = 0;

diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
@@ -26,7 +26,6 @@
 #include <sys/time.h>
 #endif
 
-#include "base/timeutil.h"
 #include "i18n/i18n.h"
 #include "profiler/profiler.h"
 
@@ -35,6 +34,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/CoreTiming.h"
 #include "Core/CoreParameter.h"

diff --git a/Core/HLE/sceFont.cpp b/Core/HLE/sceFont.cpp
@@ -1,6 +1,6 @@
 #include "sceFont.h"
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 
 #include <cmath>
 #include <vector>

diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
@@ -31,6 +31,7 @@
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeMap.h"
+#include "Common/TimeUtil.h"
 #include "Core/MIPS/MIPSCodeUtils.h"
 #include "Core/Util/PortManager.h"
 

diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
@@ -24,10 +24,10 @@
 #endif
 
 #include <time.h>
-#include "base/timeutil.h"
 
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HLE/FunctionWrappers.h"
 #include "Core/MIPS/MIPS.h"

diff --git a/Core/HW/StereoResampler.cpp b/Core/HW/StereoResampler.cpp
@@ -35,11 +35,11 @@
 #include <cstring>
 #include <atomic>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
-#include "Common/Serialize/Serializer.h"
 #include "Common/MathUtil.h"
+#include "Common/Serialize/Serializer.h"
 #include "Common/Log.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/HW/StereoResampler.h"

diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp
@@ -21,9 +21,9 @@
 #include <unordered_set>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "ext/cityhash/city.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"

diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
@@ -20,7 +20,6 @@
 #include <thread>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "base/stringutil.h"
 #include "i18n/i18n.h"
 #include "thread/threadutil.h"
@@ -29,6 +28,7 @@
 #include "Common/FileUtil.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/SaveState.h"
 #include "Core/Config.h"

diff --git a/Core/System.cpp b/Core/System.cpp
@@ -32,13 +32,13 @@
 #include <mutex>
 #include <condition_variable>
 
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "math/math_util.h"
 #include "thread/threadutil.h"
 #include "util/text/utf8.h"
 
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Core/MemFault.h"
 #include "Core/HDRemaster.h"

diff --git a/Core/Util/PortManager.cpp b/Core/Util/PortManager.cpp
@@ -29,7 +29,7 @@
 #include <cstring>
 #include <string>
 #include <thread>
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "i18n/i18n.h"
 #include "net/resolve.h"
 #include "thread/threadutil.h"

diff --git a/Core/WebServer.cpp b/Core/WebServer.cpp
@@ -20,13 +20,13 @@
 #include <thread>
 #include <unordered_map>
 #include "base/stringutil.h"
-#include "base/timeutil.h"
 #include "file/fd_util.h"
 #include "net/http_client.h"
 #include "net/http_server.h"
 #include "net/sinks.h"
 #include "thread/threadutil.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Common/Log.h"
 #include "Core/Config.h"
 #include "Core/Debugger/WebSocket.h"

diff --git a/GPU/Common/PresentationCommon.cpp b/GPU/Common/PresentationCommon.cpp
@@ -21,11 +21,11 @@
 #include <cstdint>
 
 #include "base/display.h"
-#include "base/timeutil.h"
 #include "base/NativeApp.h"
 #include "file/vfs.h"
 #include "file/zip_read.h"
 #include "thin3d/thin3d.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/ConfigValues.h"
 #include "Core/Host.h"

diff --git a/GPU/Common/TextureScalerCommon.cpp b/GPU/Common/TextureScalerCommon.cpp
@@ -47,7 +47,7 @@
 //#define DEBUG_SCALER_OUTPUT
 
 #ifdef SCALING_MEASURE_TIME
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #endif
 
 /////////////////////////////////////// Helper Functions (mostly math for parallelization)

diff --git a/GPU/D3D11/DrawEngineD3D11.cpp b/GPU/D3D11/DrawEngineD3D11.cpp
@@ -17,10 +17,9 @@
 
 #include <algorithm>
 
-#include "base/timeutil.h"
-
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"

diff --git a/GPU/Directx9/DrawEngineDX9.cpp b/GPU/Directx9/DrawEngineDX9.cpp
@@ -15,10 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/timeutil.h"
-
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"

diff --git a/GPU/GLES/DrawEngineGLES.cpp b/GPU/GLES/DrawEngineGLES.cpp
@@ -15,9 +15,8 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "base/timeutil.h"
-
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"

diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp
@@ -24,7 +24,6 @@
 #include <map>
 
 #include "math/dataconv.h"
-#include "base/timeutil.h"
 #include "gfx/gl_debug_log.h"
 #include "gfx_es2/gpu_features.h"
 #include "i18n/i18n.h"
@@ -36,6 +35,7 @@
 
 #include "Common/Log.h"
 #include "Common/FileUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/Config.h"
 #include "Core/Host.h"
 #include "Core/Reporting.h"

diff --git a/GPU/GPU.cpp b/GPU/GPU.cpp
@@ -17,7 +17,7 @@
 
 #include "ppsspp_config.h"
 
-#include "base/timeutil.h"
+#include "Common/TimeUtil.h"
 #include "Common/GraphicsContext.h"
 #include "Core/Core.h"
 

diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
@@ -2,14 +2,14 @@
 #include <type_traits>
 #include <mutex>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/ColorConv.h"
 #include "Common/GraphicsContext.h"
 #include "Common/Serialize/Serializer.h"
 #include "Common/Serialize/SerializeFuncs.h"
 #include "Common/Serialize/SerializeList.h"
+#include "Common/TimeUtil.h"
 #include "Core/Reporting.h"
 #include "GPU/GeDisasm.h"
 #include "GPU/GPU.h"

diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -17,13 +17,13 @@
 
 #include <cassert>
 
-#include "base/timeutil.h"
 #include "math/dataconv.h"
 #include "profiler/profiler.h"
 #include "thin3d/VulkanRenderManager.h"
 
 #include "Common/Log.h"
 #include "Common/MemoryUtil.h"
+#include "Common/TimeUtil.h"
 #include "Core/MemMap.h"
 #include "Core/System.h"
 #include "Core/Reporting.h"

diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -18,13 +18,13 @@
 
 #include <thread>
 
-#include "base/timeutil.h"
 #include "profiler/profiler.h"
 
 #include "Common/Log.h"
-#include "Common/Serialize/Serializer.h"
 #include "Common/FileUtil.h"
 #include "Common/GraphicsContext.h"
+#include "Common/Serialize/Serializer.h"
+#include "Common/TimeUtil.h"
 
 #include "Core/Config.h"
 #include "Core/Debugger/Breakpoints.h"