From 904c9eb3c48dfb7d3f3657762860cec73e66ff56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Thu, 7 Sep 2023 16:01:19 +0800
Subject: [PATCH] CPU (macOS): code refactor

---
 src/detection/cpu/cpu_apple.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c
index da55404ee..792a9aaac 100644
--- a/src/detection/cpu/cpu_apple.c
+++ b/src/detection/cpu/cpu_apple.c
@@ -2,17 +2,6 @@
 #include "common/sysctl.h"
 #include "detection/temps/temps_apple.h"
 
-static double getFrequency(const char* propName)
-{
-    double herz = (double) ffSysctlGetInt64(propName, 0);
-    if(herz <= 0.0)
-        return herz;
-
-    herz /= 1000.0; //to KHz
-    herz /= 1000.0; //to MHz
-    return herz / 1000.0; //to GHz
-}
-
 static double detectCpuTemp(const FFstrbuf* cpuName)
 {
     double result = 0;
@@ -52,10 +41,17 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     if(cpu->coresOnline == 1)
         cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.activecpu", 1);
 
-    cpu->frequencyMin = getFrequency("hw.cpufrequency_min");
-    cpu->frequencyMax = getFrequency("hw.cpufrequency_max");
-    if(cpu->frequencyMax == 0.0)
-        cpu->frequencyMax = getFrequency("hw.cpufrequency");
+    cpu->frequencyMin = ffSysctlGetInt64("hw.cpufrequency_min", 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;
+    else
+    {
+        unsigned current = 0;
+        size_t size = sizeof(current);
+        if (sysctl((int[]){ CTL_HW, HW_CPU_FREQ }, 2, &current, &size, NULL, 0) == 0)
+            cpu->frequencyMax = (double) current / 1000.0 / 1000.0 / 1000.0;
+    }
 
     cpu->temperature = options->temp ? detectCpuTemp(&cpu->name) : FF_CPU_TEMP_UNSET;