Changeset 9886 for ps

Timestamp:

07/20/11 10:10:36 (13 years ago)

Author:

Jan Wassenberg

Message:

OS X fix: if os_cpu_ClockFrequency reports an unknown/invalid value, measure the frequency instead; also avoid reporting invalid freqs in system_info

Location:

ps/trunk/source

Files:

• lib/sysdep/arch/x86_x64/x86_x64.cpp (modified) (1 diff)
• ps/Util.cpp (modified) (1 diff)

ps/trunk/source/lib/sysdep/arch/x86_x64/x86_x64.cpp

@@ -480 +480 @@
     size_t numSamples = 16;
     // if clock is low-res, do less samples so it doesn't take too long.
-    // balance measuring time (~ 10 ms) and accuracy (< 1 0/00 error -
+    // balance measuring time (~ 10 ms) and accuracy (< 0.1% error -
     // ok for using the TSC as a time reference)
     if(timer_Resolution() >= 1e-3)

ps/trunk/source/ps/Util.cpp

@@ -101 +101 @@
     // CPU
     fprintf(f, "CPU            : %s, %s (%dx%dx%d)", un.machine, cpu_IdentifierString(), (int)cpu_topology_NumPackages(), (int)cpu_topology_CoresPerPackage(), (int)cpu_topology_LogicalPerCore());
-    const double cpu_freq = os_cpu_ClockFrequency();
-    if(cpu_freq != 0.0f)
-    {
-        if(cpu_freq < 1e9)
-            fprintf(f, ", %.2f MHz\n", cpu_freq*1e-6);
+    double cpuClock = os_cpu_ClockFrequency();  // query OS (may fail)
+    if(cpuClock <= 0.0)
+        cpuClock = x86_x64_ClockFrequency();    // measure (takes a few ms)
+    if(cpuClock > 0.0)
+    {
+        if(cpuClock < 1e9)
+            fprintf(f, ", %.2f MHz\n", cpuClock*1e-6);
         else
-            fprintf(f, ", %.2f GHz\n", cpu_freq*1e-9);
+            fprintf(f, ", %.2f GHz\n", cpuClock*1e-9);
     }
     else