From 491d82677d271a89a8f83f180f3afd9c90c0c5ba Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 27 Aug 2024 14:48:28 +0100 Subject: Fix measuring the CPU load on Windows. --- src/inspircd.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/inspircd.cpp') diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 94d19f80f..0f568e1f4 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -105,7 +105,7 @@ namespace ServerInstance->Stats.LastSampled.tv_nsec = ServerInstance->Time_ns(); ServerInstance->Stats.LastCPU = ru.ru_utime; #else - if (!QueryPerformanceCounter(&ServerInstance->Stats.LastSampled)) + if (!QueryPerformanceCounter(&ServerInstance->Stats.LastCPU)) return; // Should never happen. FILETIME CreationTime; @@ -114,8 +114,8 @@ namespace FILETIME UserTime; GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime); - ServerInstance->Stats.LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime; - ServerInstance->Stats.LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime; + ServerInstance->Stats.LastSampled.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime; + ServerInstance->Stats.LastSampled.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime; #endif } @@ -588,7 +588,7 @@ InspIRCd::InspIRCd(int argc, char** argv) FreeConsole(); } - QueryPerformanceFrequency(&this->Stats.QPFrequency); + QueryPerformanceFrequency(&this->Stats.BootCPU); #endif WritePID(); -- cgit v1.3.1-10-gc9f91