From 959371d1eabe4af18d405ffd03cc95ad375562a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sat, 8 Oct 2022 19:07:02 +0800 Subject: [PATCH] CpuUsage: Disable no wait detection by default because the result does need some time to generate --- src/detection/cpuUsage/cpuUsage.c | 22 +++++++++++----------- src/detection/cpuUsage/cpuUsage.h | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/detection/cpuUsage/cpuUsage.c b/src/detection/cpuUsage/cpuUsage.c index 61aaaf817..7470236dc 100644 --- a/src/detection/cpuUsage/cpuUsage.c +++ b/src/detection/cpuUsage/cpuUsage.c @@ -1,7 +1,17 @@ #include "fastfetch.h" #include "cpuUsage.h" -#ifndef FF_DETECTION_CPUUSAGE_NOWAIT +#if FF_DETECTION_CPUUSAGE_NOWAIT + +const char* ffGetCpuUsageResultNoWait(double* result); + +void ffPrepareCPUUsage() {} + +const char* ffGetCpuUsageResult(double* result) { + return ffGetCpuUsageResultNoWait(result); +} + +#else //FF_DETECTION_CPUUSAGE_NOWAIT #include "common/time.h" @@ -45,14 +55,4 @@ const char* ffGetCpuUsageResult(double* result) return NULL; } -#else //FF_DETECTION_CPUUSAGE_NOWAIT - -const char* ffGetCpuUsageResultNoWait(double* result); - -void ffPrepareCPUUsage() {} - -const char* ffGetCpuUsageResult(double* result) { - return ffGetCpuUsageResultNoWait(result); -} - #endif //FF_DETECTION_CPUUSAGE_NOWAIT diff --git a/src/detection/cpuUsage/cpuUsage.h b/src/detection/cpuUsage/cpuUsage.h index 0c76275c0..4ac03c222 100644 --- a/src/detection/cpuUsage/cpuUsage.h +++ b/src/detection/cpuUsage/cpuUsage.h @@ -4,7 +4,8 @@ #define FF_INCLUDED_detection_cpu_cpuUsage #if defined(_WIN32) || defined(__MSYS__) - #define FF_DETECTION_CPUUSAGE_NOWAIT 1 + // Disabled by default because the result does need some time to generate + #define FF_DETECTION_CPUUSAGE_NOWAIT 0 #endif const char* ffGetCpuUsageResult(double* result);