From 7e04e23528def37289b11c763cd6bab98b202ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 13 Mar 2024 23:42:59 +0800 Subject: [PATCH] CPU: rename min frequency to base frequency --- src/detection/cpu/cpu.h | 2 +- src/detection/cpu/cpu_apple.c | 4 ++-- src/detection/cpu/cpu_bsd.c | 4 ++-- src/detection/cpu/cpu_linux.c | 6 +++--- src/detection/cpu/cpu_windows.c | 2 +- src/modules/cpu/cpu.c | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/detection/cpu/cpu.h b/src/detection/cpu/cpu.h index cef5a14b7..e53772f74 100644 --- a/src/detection/cpu/cpu.h +++ b/src/detection/cpu/cpu.h @@ -13,7 +13,7 @@ typedef struct FFCPUResult uint16_t coresLogical; uint16_t coresOnline; - double frequencyMin; // GHz + double frequencyBase; // GHz double frequencyMax; // GHz double temperature; diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c index 62a317615..ce95795f8 100644 --- a/src/detection/cpu/cpu_apple.c +++ b/src/detection/cpu/cpu_apple.c @@ -53,7 +53,7 @@ static const char* detectFrequency(FFCPUResult* cpu) if (ffCfDictGetData(properties, CFSTR("voltage-states1-sram"), 0, 4, (uint8_t*) &eMin, NULL) != NULL) // eCore return "\"voltage-states1-sram\" in \"pmgr\" is not found"; - cpu->frequencyMin = (pMin < eMin ? pMin : eMin) / (1000.0 * 1000 * 1000); + cpu->frequencyBase = (pMin < eMin ? pMin : eMin) / (1000.0 * 1000 * 1000); if (pCoreLength >= 8) { @@ -68,7 +68,7 @@ static const char* detectFrequency(FFCPUResult* cpu) #else static const char* detectFrequency(FFCPUResult* cpu) { - cpu->frequencyMin = ffSysctlGetInt64("hw.cpufrequency", 0) / 1000.0 / 1000.0 / 1000.0; + cpu->frequencyBase = ffSysctlGetInt64("hw.cpufrequency", 0) / 1000.0 / 1000.0 / 1000.0; cpu->frequencyMax = ffSysctlGetInt64("hw.cpufrequency_max", 0); if(cpu->frequencyMax > 0.0) cpu->frequencyMax /= 1000.0 * 1000.0 * 1000.0; diff --git a/src/detection/cpu/cpu_bsd.c b/src/detection/cpu/cpu_bsd.c index 2d6a1bd28..225e09fbe 100644 --- a/src/detection/cpu/cpu_bsd.c +++ b/src/detection/cpu/cpu_bsd.c @@ -11,8 +11,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu) cpu->coresLogical = cpu->coresPhysical; cpu->coresOnline = cpu->coresPhysical; - cpu->frequencyMin = ffSysctlGetInt("hw.clockrate", 0) / 1000.0; - cpu->frequencyMax = cpu->frequencyMin; + cpu->frequencyBase = ffSysctlGetInt("hw.clockrate", 0) / 1000.0; + cpu->frequencyMax = cpu->frequencyBase; cpu->temperature = FF_CPU_TEMP_UNSET; if (options->temp) diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 6fc8cc555..b011e51d3 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -129,12 +129,12 @@ static bool detectFrequency(FFCPUResult* cpu) if (flag) { - cpu->frequencyMin = cpu->frequencyMin > fbase ? cpu->frequencyMin : fbase; + cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase; cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax; } else { - cpu->frequencyMin = fbase; + cpu->frequencyBase = fbase; cpu->frequencyMax = fmax; flag = true; } @@ -238,7 +238,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu) cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical); if (!detectFrequency(cpu)) - cpu->frequencyMin = cpu->frequencyMax = ffStrbufToDouble(&cpuMHz) / 1000; + cpu->frequencyBase = cpu->frequencyMax = ffStrbufToDouble(&cpuMHz) / 1000; if(cpuUarch.length > 0) { diff --git a/src/detection/cpu/cpu_windows.c b/src/detection/cpu/cpu_windows.c index 874997b34..faa9bda22 100644 --- a/src/detection/cpu/cpu_windows.c +++ b/src/detection/cpu/cpu_windows.c @@ -119,7 +119,7 @@ static const char* detectByRegistry(FFCPUResult* cpu) { uint32_t mhz; if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL)) - cpu->frequencyMin = cpu->frequencyMax = mhz / 1000.0; + cpu->frequencyBase = cpu->frequencyMax = mhz / 1000.0; } ffRegReadStrbuf(hKey, L"ProcessorNameString", &cpu->name, NULL); diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 281310313..c9e23c477 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -13,7 +13,7 @@ void ffPrintCPU(FFCPUOptions* options) FFCPUResult cpu; cpu.temperature = FF_CPU_TEMP_UNSET; cpu.coresPhysical = cpu.coresLogical = cpu.coresOnline = 0; - cpu.frequencyMax = cpu.frequencyMin = 0; + cpu.frequencyMax = cpu.frequencyBase = 0; ffStrbufInit(&cpu.name); ffStrbufInit(&cpu.vendor); @@ -69,7 +69,7 @@ void ffPrintCPU(FFCPUOptions* options) {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresPhysical}, {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresLogical}, {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresOnline}, - {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyMin}, + {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyBase}, {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyMax}, {FF_FORMAT_ARG_TYPE_STRBUF, &tempStr} })); @@ -143,7 +143,7 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_ FFCPUResult cpu; cpu.temperature = FF_CPU_TEMP_UNSET; cpu.coresPhysical = cpu.coresLogical = cpu.coresOnline = 0; - cpu.frequencyMax = cpu.frequencyMin = 0; + cpu.frequencyMax = cpu.frequencyBase = 0; ffStrbufInit(&cpu.name); ffStrbufInit(&cpu.vendor); @@ -169,7 +169,7 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_ yyjson_mut_obj_add_uint(doc, cores, "online", cpu.coresOnline); yyjson_mut_val* frequency = yyjson_mut_obj_add_obj(doc, obj, "frequency"); - yyjson_mut_obj_add_real(doc, frequency, "min", cpu.frequencyMin); + yyjson_mut_obj_add_real(doc, frequency, "base", cpu.frequencyBase); yyjson_mut_obj_add_real(doc, frequency, "max", cpu.frequencyMax); yyjson_mut_obj_add_real(doc, obj, "temperature", cpu.temperature); @@ -187,7 +187,7 @@ void ffPrintCPUHelpFormat(void) "Physical core count", "Logical core count", "Online core count", - "Min frequency", + "Base frequency", "Max frequency", "Temperature (formatted)" }));