Ticket #52822: patch-gstreamer1-darwin-numcpufix-sysctl.diff

plugins/tracers/gstrusage.c

@@ -39 +39 @@
 #include <sys/resource.h>
 #endif
 
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
 GST_DEBUG_CATEGORY_STATIC (gst_rusage_debug);
 #define GST_CAT_DEFAULT gst_rusage_debug
 
@@ -274 +277 @@
 
   gobject_class->finalize = gst_rusage_tracer_finalize;
 
-  if ((num_cpus = sysconf (_SC_NPROCESSORS_ONLN)) == -1) {
-    GST_WARNING ("failed to get number of cpus online");
-    if ((num_cpus = sysconf (_SC_NPROCESSORS_CONF)) == -1) {
-      GST_WARNING ("failed to get number of cpus, assuming 1");
-      num_cpus = 1;
-    }
+  int nm[2];
+  size_t len = 4;
+  uint32_t count;
+  
+  nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
+  sysctl(nm, 2, &count, &len, NULL, 0);
+  
+  if (count < 1) {
+        nm[1] = HW_NCPU;
+        sysctl(nm, 2, &count, &len, NULL, 0);
+        if (count < 1) { count = 1; }
   }
+  num_cpus = (glong)count;
+
   GST_DEBUG ("rusage: num_cpus=%ld", num_cpus);
 
   /* announce trace formats */