From 30c63fa4a618f7629f22079247dbd7536e7e4187 Mon Sep 17 00:00:00 2001 From: mitaclaw <140017135+mitaclaw@users.noreply.github.com> Date: Fri, 5 Apr 2024 22:30:03 -0700 Subject: [PATCH] Common: Remove Unused PerformanceCounter Code --- Source/Core/Common/CMakeLists.txt | 2 - Source/Core/Common/PerformanceCounter.cpp | 47 ----------------------- Source/Core/Common/PerformanceCounter.h | 16 -------- Source/Core/Core/PowerPC/Jit64/Jit.cpp | 1 - Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 1 - Source/Core/Core/PowerPC/JitInterface.cpp | 6 --- Source/Core/DolphinLib.props | 2 - 7 files changed, 75 deletions(-) delete mode 100644 Source/Core/Common/PerformanceCounter.cpp delete mode 100644 Source/Core/Common/PerformanceCounter.h diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 1431239af2..7b81cd2c6d 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -108,8 +108,6 @@ add_library(common Network.h PcapFile.cpp PcapFile.h - PerformanceCounter.cpp - PerformanceCounter.h Profiler.cpp Profiler.h QoSSession.cpp diff --git a/Source/Core/Common/PerformanceCounter.cpp b/Source/Core/Common/PerformanceCounter.cpp deleted file mode 100644 index efe78e33db..0000000000 --- a/Source/Core/Common/PerformanceCounter.cpp +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2014 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#if !defined(_WIN32) -#include "Common/PerformanceCounter.h" - -#include -#include - -#include - -#include "Common/CommonTypes.h" - -#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 -#if defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0 -#define DOLPHIN_CLOCK CLOCK_MONOTONIC -#else -#define DOLPHIN_CLOCK CLOCK_REALTIME -#endif -#endif - -bool QueryPerformanceCounter(u64* out) -{ -#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 - timespec tp; - if (clock_gettime(DOLPHIN_CLOCK, &tp)) - return false; - *out = (u64)tp.tv_nsec + (u64)1000000000 * (u64)tp.tv_sec; - return true; -#else - *out = 0; - return false; -#endif -} - -bool QueryPerformanceFrequency(u64* out) -{ -#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 - *out = 1000000000; - return true; -#else - *out = 1; - return false; -#endif -} - -#endif diff --git a/Source/Core/Common/PerformanceCounter.h b/Source/Core/Common/PerformanceCounter.h deleted file mode 100644 index 080f40c6cf..0000000000 --- a/Source/Core/Common/PerformanceCounter.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2014 Dolphin Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#if !defined(_WIN32) - -#include - -#include "Common/CommonTypes.h" - -typedef u64 LARGE_INTEGER; -bool QueryPerformanceCounter(u64* out); -bool QueryPerformanceFrequency(u64* lpFrequency); - -#endif diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp index 826a7ac8d6..867190e284 100644 --- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp +++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp @@ -19,7 +19,6 @@ #include "Common/GekkoDisassembler.h" #include "Common/IOFile.h" #include "Common/Logging/Log.h" -#include "Common/PerformanceCounter.h" #include "Common/StringUtil.h" #include "Common/Swap.h" #include "Common/x64ABI.h" diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index 8e08d2b21d..f596128ef9 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -10,7 +10,6 @@ #include "Common/Logging/Log.h" #include "Common/MathUtil.h" #include "Common/MsgHandler.h" -#include "Common/PerformanceCounter.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 7c01b1fa83..bd31893035 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -7,12 +7,6 @@ #include #include -#ifdef _WIN32 -#include -#else -#include "Common/PerformanceCounter.h" -#endif - #include #include "Common/Assert.h" diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props index 935efe89d2..cd6fcfc161 100644 --- a/Source/Core/DolphinLib.props +++ b/Source/Core/DolphinLib.props @@ -141,7 +141,6 @@ - @@ -823,7 +822,6 @@ -