tbfreq x clockrate.hz only when cpufrequency is 0

Just maybe M3 implements cpufrequency, which should be more accurate
than the alternative (different results on my Intel Mac).

1 files changed, 8 insertions, 8 deletions

diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index f07a32c179..d3ff48073d 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -637,15 +637,15 @@ public:
     LLProcessorInfoDarwinImpl()
     {
         getCPUIDInfo();
-#ifdef __arm64__
-        auto frequency = getSysctlInt64("hw.tbfrequency");
-        struct clockinfo clockrate;
-        auto clockrate_len = sizeof(clockrate);
-        if (!sysctlbyname("kern.clockrate", &clockrate, &clockrate_len, NULL, 0))
-            frequency *= clockrate.hz;
-#else
         uint64_t frequency = getSysctlInt64("hw.cpufrequency");
-#endif
+        if (!frequency)
+        {
+            auto tbfrequency = getSysctlInt64("hw.tbfrequency");
+            struct clockinfo clockrate;
+            auto clockrate_len = sizeof(clockrate);
+            if (!sysctlbyname("kern.clockrate", &clockrate, &clockrate_len, NULL, 0))
+                frequency = tbfrequency * clockrate.hz;
+        }
         setInfo(eFrequency, (F64)frequency  / (F64)1000000);
     }