Revert CPU clipping in the presence of CPU quota to 3.0, 2.x behavior.

Basically reverting https://github.com/dotnet/coreclr/pull/26806

3 files changed, 17 insertions, 0 deletions

diff --git a/src/classlibnative/bcltype/system.cpp b/src/classlibnative/bcltype/system.cpp
index 402a215e9f..e38f7db292 100644
--- a/src/classlibnative/bcltype/system.cpp
+++ b/src/classlibnative/bcltype/system.cpp
@@ -352,6 +352,13 @@ INT32 QCALLTYPE SystemNative::GetProcessorCount()
         processorCount = systemInfo.dwNumberOfProcessors;
     }
 
+#ifdef FEATURE_PAL	
+    uint32_t cpuLimit;	
+
+    if (PAL_GetCpuLimit(&cpuLimit) && cpuLimit < (uint32_t)processorCount)	
+        processorCount = cpuLimit;	
+#endif
+
     END_QCALL;
 
     return processorCount;
diff --git a/src/pal/src/thread/process.cpp b/src/pal/src/thread/process.cpp
index 4f9d318bef..4b77f6327d 100644
--- a/src/pal/src/thread/process.cpp
+++ b/src/pal/src/thread/process.cpp
@@ -2558,6 +2558,12 @@ PAL_GetCPUBusyTime(
         {
             return 0;
         }
+
+        UINT cpuLimit;	
+        if (PAL_GetCpuLimit(&cpuLimit) && cpuLimit < dwNumberOfProcessors)	
+        {	
+            dwNumberOfProcessors = cpuLimit;	
+        }
     }
 
     if (getrusage(RUSAGE_SELF, &resUsage) == -1)
diff --git a/src/utilcode/util.cpp b/src/utilcode/util.cpp
index e0f0200076..5c35b1ab5f 100644
--- a/src/utilcode/util.cpp
+++ b/src/utilcode/util.cpp
@@ -1289,6 +1289,10 @@ int GetCurrentProcessCpuCount()
 
 #else // !FEATURE_PAL
     count = PAL_GetLogicalCpuCountFromOS();
+
+    uint32_t cpuLimit;	
+    if (PAL_GetCpuLimit(&cpuLimit) && cpuLimit < count)	
+        count = cpuLimit;	
 #endif // !FEATURE_PAL
 
     cCPUs = count;