From d296e53213d67aacd597730eaec0d5aafae0d46a Mon Sep 17 00:00:00 2001 From: Carter Li Date: Mon, 17 Jun 2024 22:51:02 +0800 Subject: [PATCH] CPUUsage (BSD): fix totalAll calculation --- src/detection/cpuusage/cpuusage_bsd.c | 6 +++--- src/detection/cpuusage/cpuusage_linux.c | 4 ++-- src/detection/cpuusage/cpuusage_windows.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/detection/cpuusage/cpuusage_bsd.c b/src/detection/cpuusage/cpuusage_bsd.c index 87c6757a7..af513878f 100644 --- a/src/detection/cpuusage/cpuusage_bsd.c +++ b/src/detection/cpuusage/cpuusage_bsd.c @@ -23,12 +23,12 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes) { uint64_t* cpTime = cpTimes[i]; uint64_t inUse = cpTime[CP_USER] + cpTime[CP_NICE] + cpTime[CP_SYS]; - uint64_t total = cpTime[CP_INTR] + cpTime[CP_IDLE]; + uint64_t total = inUse + cpTime[CP_INTR] + cpTime[CP_IDLE]; FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes); *info = (FFCpuUsageInfo) { - .inUseAll = (uint64_t)inUse, - .totalAll = (uint64_t)total, + .inUseAll = inUse, + .totalAll = total, }; } diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c index 118353e2c..b91d6eeb1 100644 --- a/src/detection/cpuusage/cpuusage_linux.c +++ b/src/detection/cpuusage/cpuusage_linux.c @@ -36,8 +36,8 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes) FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes); *info = (FFCpuUsageInfo) { - .inUseAll = (uint64_t)inUse, - .totalAll = (uint64_t)total, + .inUseAll = inUse, + .totalAll = total, }; } else diff --git a/src/detection/cpuusage/cpuusage_windows.c b/src/detection/cpuusage/cpuusage_windows.c index cf513340e..21c582b13 100644 --- a/src/detection/cpuusage/cpuusage_windows.c +++ b/src/detection/cpuusage/cpuusage_windows.c @@ -31,8 +31,8 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes) FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes); *info = (FFCpuUsageInfo) { - .inUseAll = (uint64_t)inUse, - .totalAll = (uint64_t)total, + .inUseAll = inUse, + .totalAll = total, }; }