diff --git a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp index 62d831c5..ed45b139 100644 --- a/src/Cafe/HW/Latte/Core/LatteOverlay.cpp +++ b/src/Cafe/HW/Latte/Core/LatteOverlay.cpp @@ -12,7 +12,7 @@ #include "imgui/imgui_extension.h" #include "input/InputManager.h" -#include "util/ProcessorTime/ProcessorTime.h" +#include "util/SystemInfo/SystemInfo.h" #include diff --git a/src/util/ProcessorTime/ProcessorTime.cpp b/src/util/SystemInfo/SystemInfo.cpp similarity index 91% rename from src/util/ProcessorTime/ProcessorTime.cpp rename to src/util/SystemInfo/SystemInfo.cpp index b185fc81..54f7e10e 100644 --- a/src/util/ProcessorTime/ProcessorTime.cpp +++ b/src/util/SystemInfo/SystemInfo.cpp @@ -1,4 +1,4 @@ -#include "util/ProcessorTime/ProcessorTime.h" +#include "util/SystemInfo/SystemInfo.h" uint64_t ProcessorTime::work() { diff --git a/src/util/ProcessorTime/ProcessorTime.h b/src/util/SystemInfo/SystemInfo.h similarity index 100% rename from src/util/ProcessorTime/ProcessorTime.h rename to src/util/SystemInfo/SystemInfo.h index 9ad774d7..10abb85d 100644 --- a/src/util/ProcessorTime/ProcessorTime.h +++ b/src/util/SystemInfo/SystemInfo.h @@ -10,9 +10,9 @@ struct ProcessorTime static double Compare(ProcessorTime &last, ProcessorTime &now); }; -uint32_t GetProcessorCount(); void QueryProcTime(uint64_t &out_now, uint64_t &out_user, uint64_t &out_kernel); void QueryProcTime(ProcessorTime &out); void QueryCoreTimes(uint32_t count, ProcessorTime out[]); +uint32_t GetProcessorCount(); uint64_t QueryRamUsage(); \ No newline at end of file diff --git a/src/util/ProcessorTime/ProcessorTimeUnix.cpp b/src/util/SystemInfo/SystemInfoUnix.cpp similarity index 96% rename from src/util/ProcessorTime/ProcessorTimeUnix.cpp rename to src/util/SystemInfo/SystemInfoUnix.cpp index 5ea4bf8c..fc5fd252 100644 --- a/src/util/ProcessorTime/ProcessorTimeUnix.cpp +++ b/src/util/SystemInfo/SystemInfoUnix.cpp @@ -1,6 +1,6 @@ #if BOOST_OS_LINUX -#include "util/ProcessorTime/ProcessorTime.h" +#include "util/SystemInfo/SystemInfo.h" #include #include diff --git a/src/util/ProcessorTime/ProcessorTimeWin.cpp b/src/util/SystemInfo/SystemInfoWin.cpp similarity index 97% rename from src/util/ProcessorTime/ProcessorTimeWin.cpp rename to src/util/SystemInfo/SystemInfoWin.cpp index e0dcd19b..601b08d1 100644 --- a/src/util/ProcessorTime/ProcessorTimeWin.cpp +++ b/src/util/SystemInfo/SystemInfoWin.cpp @@ -1,6 +1,6 @@ #if BOOST_OS_WINDOWS -#include "util/ProcessorTime/ProcessorTime.h" +#include "util/SystemInfo/SystemInfo.h" #include #include