Merge pull request #3680 from martin-frbg/issue3636-2

Guard against sysconf(__SC_NPROCESSORS_CONF) returning zero at runtime

Author: martin-frbg

driver/others/init.c

@@ -877,34 +877,34 @@ void gotoblas_affinity_init(void) {
     nums = sysconf(_SC_NPROCESSORS_CONF);
 
 #if !defined(__GLIBC_PREREQ)
-    common->num_procs = nums;
+    common->num_procs = nums >0 ? nums : 2;
 #else
 
 #if !__GLIBC_PREREQ(2, 3)
-    common->num_procs = nums;
+    common->num_procs = nums >0 ? nums : 2;
 #elif __GLIBC_PREREQ(2, 7)
-    cpusetp = CPU_ALLOC(nums);
+    cpusetp = CPU_ALLOC(nums>0? nums:1024);
     if (cpusetp == NULL) {
-        common->num_procs = nums;
+        common->num_procs = nums>0 ? nums: 2;
     } else {
         size_t size;
-        size = CPU_ALLOC_SIZE(nums);
+        size = CPU_ALLOC_SIZE(nums>0? nums: 1024);
         ret = sched_getaffinity(0,size,cpusetp);
         if (ret!=0)
-            common->num_procs = nums;
+            common->num_procs = nums >0 ? nums : 1;
         else
             common->num_procs = CPU_COUNT_S(size,cpusetp);
     }
     CPU_FREE(cpusetp);
 #else
     ret = sched_getaffinity(0,sizeof(cpu_set_t), &cpuset);
     if (ret!=0) {
-        common->num_procs = nums;
+        common->num_procs = nums >0 ? nums : 2;
     } else {
 #if !__GLIBC_PREREQ(2, 6)
     int i;
     int n = 0;
-    for (i=0;i<nums;i++)
+    for (i=0;i<(nums >0 ?nums:1024) ;i++)
         if (CPU_ISSET(i,&cpuset)) n++;
     common->num_procs = n;
     }
@@ -1022,7 +1022,7 @@ void gotoblas_set_affinity2(int threads) {};
 
 void gotoblas_affinity_reschedule(void) {};
 
-int get_num_procs(void) { return sysconf(_SC_NPROCESSORS_CONF); }
+int get_num_procs(void) { int num = sysconf(_SC_NPROCESSORS_CONF); return (nums >0 ? nums : 2); }
 
 int get_num_nodes(void) { return 1; }
 

driver/others/memory.c

@@ -252,23 +252,23 @@ int get_num_procs(void) {
     ret = omp_get_num_places();
     if (ret >0 ) nums = ret;
 #endif
-    return nums;
+    return (nums > 0 ? nums : 2);
 #endif
 
 #if !defined(OS_LINUX)
-  return nums;
+  return (nums > 0 ? nums : 2);
 #endif
 
 #if !defined(__GLIBC_PREREQ)
-  return nums;
+  return (nums > 0 ? nums :2);
 #else
  #if !__GLIBC_PREREQ(2, 3)
-  return nums;
+  return (nums > 0 ? nums :2);
  #endif
 
  #if !__GLIBC_PREREQ(2, 7)
   ret = sched_getaffinity(0,sizeof(cpuset), &cpuset);
-  if (ret!=0) return nums;
+  if (ret!=0) return (nums > 0 ? nums :2);
   n=0;
   #if !__GLIBC_PREREQ(2, 6)
   for (i=0;i<nums;i++)
@@ -277,31 +277,31 @@ int get_num_procs(void) {
   #else
   nums = CPU_COUNT(sizeof(cpuset),&cpuset);
   #endif
-  return nums;
+  return (nums > 0 ? nums :2);
  #else
   if (nums >= CPU_SETSIZE) {
     cpusetp = CPU_ALLOC(nums);
       if (cpusetp == NULL) {
-        return nums;
+        return (nums > 0 ? nums :2);
       }
     size = CPU_ALLOC_SIZE(nums);
     ret = sched_getaffinity(0,size,cpusetp);
     if (ret!=0) {
       CPU_FREE(cpusetp);
-      return nums;
+      return (nums > 0 ? nums :2);
     }
     ret = CPU_COUNT_S(size,cpusetp);
     if (ret > 0 && ret < nums) nums = ret;
     CPU_FREE(cpusetp);
-    return nums;
+    return (nums > 0 ? nums :2);
   } else {
     ret = sched_getaffinity(0,sizeof(cpuset),&cpuset);
     if (ret!=0) {
-      return nums;
+      return (nums > 0 ? nums :2);
     }
     ret = CPU_COUNT(&cpuset);
     if (ret > 0 && ret < nums) nums = ret;
-    return nums;
+    return (nums > 0 ? nums :2);
   }
  #endif
 #endif
@@ -1823,56 +1823,56 @@ int get_num_procs(void) {
     ret = omp_get_num_places();
     if (ret >0 ) nums = ret;
 #endif
-    return nums;
+    return (nums > 0 ? nums :2);
 #endif
 
 #if !defined(OS_LINUX)
-  return nums;
+  return (nums > 0 ? nums :2);
 #endif
 
 #if !defined(__GLIBC_PREREQ)
-  return nums;
+  return (nums > 0 ? nums :2);
 #else
  #if !__GLIBC_PREREQ(2, 3)
-  return nums;
+  return (nums > 0 ? nums :2);
  #endif
 
  #if !__GLIBC_PREREQ(2, 7)
   ret = sched_getaffinity(0,sizeof(cpuset), &cpuset);
-  if (ret!=0) return nums;
+  if (ret!=0) return (nums > 0 ? nums :2);
   n=0;
   #if !__GLIBC_PREREQ(2, 6)
-  for (i=0;i<nums;i++)
+  for (i=0;i<(nums > 0 ? nums :2);i++)
      if (CPU_ISSET(i,&cpuset)) n++;
   nums=n;
   #else
   nums = CPU_COUNT(sizeof(cpuset),&cpuset);
   #endif
-  return nums;
+  return (nums > 0 ? nums :2);
  #else
   if (nums >= CPU_SETSIZE) {
     cpusetp = CPU_ALLOC(nums);
       if (cpusetp == NULL) {
-        return nums;
+        return (nums > 0 ? nums :2);
       }
     size = CPU_ALLOC_SIZE(nums);
     ret = sched_getaffinity(0,size,cpusetp);
     if (ret!=0) {
       CPU_FREE(cpusetp);
-      return nums;
+      return (nums > 0 ? nums :2);
     }
     ret = CPU_COUNT_S(size,cpusetp);
     if (ret > 0 && ret < nums) nums = ret;
     CPU_FREE(cpusetp);
-    return nums;
+    return (nums > 0 ? nums :2);
   } else {
     ret = sched_getaffinity(0,sizeof(cpuset),&cpuset);
     if (ret!=0) {
-      return nums;
+      return (nums > 0 ? nums :2);
     }
     ret = CPU_COUNT(&cpuset);
     if (ret > 0 && ret < nums) nums = ret;
-    return nums;
+    return (nums > 0 ? nums :2);
   }
  #endif
 #endif