Use sysconf(_SC_NPROCESSORS_CONF) to get number of processors (#5853)

Port dotnet/coreclr#18053
dotnet · May 25, 2018 · 57289ff · 57289ff
1 parent ece4ed1
commit 57289ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Native/Runtime/unix/PalRedhawkUnix.cpp b/src/Native/Runtime/unix/PalRedhawkUnix.cpp
@@ -834,10 +834,10 @@ bool QueryCacheSize()
 bool QueryLogicalProcessorCount()
 {
 #if HAVE_SYSCONF
-    g_cLogicalCpus = sysconf(_SC_NPROCESSORS_ONLN);
+    g_cLogicalCpus = sysconf(_SC_NPROCESSORS_CONF);
     if (g_cLogicalCpus < 1)
     {
-        ASSERT_UNCONDITIONALLY("sysconf failed for _SC_NPROCESSORS_ONLN\n");
+        ASSERT_UNCONDITIONALLY("sysconf failed for _SC_NPROCESSORS_CONF\n");
         return false;
     }
 #elif HAVE_SYSCTL
@@ -1268,10 +1268,10 @@ bool InitializeSystemInfo()
     int nrcpus = 0;
 
 #if HAVE_SYSCONF
-    nrcpus = sysconf(_SC_NPROCESSORS_ONLN);
+    nrcpus = sysconf(_SC_NPROCESSORS_CONF);
     if (nrcpus < 1)
     {
-        ASSERT_UNCONDITIONALLY("sysconf failed for _SC_NPROCESSORS_ONLN\n");
+        ASSERT_UNCONDITIONALLY("sysconf failed for _SC_NPROCESSORS_CONF\n");
         return false;
     }
 #elif HAVE_SYSCTL

diff --git a/src/Native/System.Private.CoreLib.Native/pal_time.cpp b/src/Native/System.Private.CoreLib.Native/pal_time.cpp
@@ -168,7 +168,7 @@ extern "C" int32_t CoreLibNative_GetCpuUtilization(ProcessCpuInformation* previo
 {
     if (numProcessors <= 0)
     {
-        numProcessors = sysconf(_SC_NPROCESSORS_ONLN);
+        numProcessors = sysconf(_SC_NPROCESSORS_CONF);
         if (numProcessors <= 0)
         {
             return 0;

diff --git a/src/Native/gc/unix/gcenv.unix.cpp b/src/Native/gc/unix/gcenv.unix.cpp
@@ -84,7 +84,7 @@ static pthread_mutex_t g_flushProcessWriteBuffersMutex;
 bool GCToOSInterface::Initialize()
 {
     // Calculate and cache the number of processors on this machine
-    int cpuCount = sysconf(_SC_NPROCESSORS_ONLN);
+    int cpuCount = sysconf(_SC_NPROCESSORS_CONF);
     if (cpuCount == -1)
     {
         return false;