Ticket #26454: patch-cpuinfo-tovid-init.in.2.diff

src/tovid-init.in

@@ -449 +449 @@
 
 
 # ******************************************************************************
-# Platform-specific initialization
-# Determines host platform and configures things accordingly
+# configure whether to use multiple cpus
 # ******************************************************************************
-KERNEL=$(uname)
-if test "$KERNEL" = "Linux"; then
-    # Linux should have /proc/cpuinfo
-    CPU_MODEL=$(awk -F ":" '/model name/ {print $2}' /proc/cpuinfo | head -n 1)
-    CPU_SPEED=$(awk 'BEGIN { IGNORECASE = 1 } /MHz/ { print $4 }' /proc/cpuinfo | head -n 1)
-    # Test for multiple CPUs. If they are available, try to use them.
-    if test $(grep "^processor" /proc/cpuinfo | wc -l) -ge "2"; then
-        MULTIPLE_CPUS=:
-    else
-        MULTIPLE_CPUS=false
-    fi
-elif test "$KERNEL" = "Darwin"; then
-    :
+CPU_MODEL=$(sysctl -n -a machdep.cpu.brand_string)
+CPU_SPEED=$(sysctl -n -a hw.cpufrequency)
+CPU_SPEED=$(bc_math "$CPU_SPEED / 1000000000")
+# Test for multiple CPUs. If they are available, try to use them.
+if test $(sysctl -n -a hw.activecpu) -ge "2"; then
+    MULTIPLE_CPUS=:
+else
+    MULTIPLE_CPUS=false
 fi