Merge branch 'master' into c0000005

Author: altendky

.github/workflows/build-wheels.yml

@@ -58,6 +58,94 @@ jobs:
             archs:
               linux: i686 x86_64 aarch64
               macos: x86_64 arm64
+          - build: cp310-*
+            version: v2
+            code: CPython3.10
+            manylinux: manylinux_2_24
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: cp311-*
+            version: v2
+            code: CPython3.11
+            manylinux: manylinux_2_24
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: cp312-*
+            version: v2
+            code: CPython3.12
+            manylinux: manylinux_2_28
+            musllinux: musllinux_1_2
+            archs:
+              linux: x86_64 aarch64
+              macos: x86_64 arm64
+          - build: cp313-*
+            version: v2
+            code: CPython3.13
+            manylinux: manylinux_2_28
+            musllinux: musllinux_1_2
+            archs:
+              linux: x86_64 aarch64
+              macos: x86_64 arm64
+          - build: cp314-*
+            version: v3
+            code: CPython3.14
+            manylinux: manylinux_2_28
+            musllinux: musllinux_1_2
+            archs:
+              linux: x86_64 aarch64
+              macos: x86_64 arm64
+          - build: pp27-*
+            version: v1
+            code: PyPy2.7
+            manylinux: manylinux1
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64
+          - build: pp37-*
+            version: v2
+            code: PyPy3.7
+            manylinux: manylinux_2_24
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: pp38-*
+            version: v2
+            code: PyPy3.8
+            manylinux: manylinux_2_24
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: pp39-*
+            version: v2
+            code: PyPy3.9
+            manylinux: manylinux_2_24
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: pp310-*
+            version: v3
+            code: PyPy3.10
+            manylinux: manylinux_2_28
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
+          - build: pp311-*
+            version: v3
+            code: PyPy3.11
+            manylinux: manylinux_2_28
+            musllinux: musllinux_1_2
+            archs:
+              linux: i686 x86_64 aarch64
+              macos: x86_64 arm64
         repeat: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
         exclude:
           - os:
@@ -202,6 +290,7 @@ jobs:
         with:
           output-dir: dist
         env:
+          CIBW_ENABLE: pypy
           CIBW_BUILD: ${{ matrix.cibw.build }}
           CIBW_BUILD_VERBOSITY: 2
           # Skip 32-bit builds // NO
@@ -234,6 +323,7 @@ jobs:
         with:
           output-dir: dist
         env:
+          CIBW_ENABLE: pypy pypy-eol
           CIBW_BUILD: ${{ matrix.cibw.build }}
           CIBW_BUILD_VERBOSITY: 2
           # Skip 32-bit builds // NO

src/util.c

@@ -40,7 +40,7 @@ typedef BOOL(WINAPI* LPFN_GLPI)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, PDWORD);
 int UTIL_countAvailableCores(void)
 {
     time_t currTime = time(NULL);
-    if (lastTimeCached && currTime-lastTimeCached>=util_cpuCoresCacheTTL) numLogicalCores = 0;
+    if (lastTimeCached && currTime-lastTimeCached>util_cpuCoresCacheTTL) numLogicalCores = 0;
     if (numLogicalCores != 0) return numLogicalCores;
 
     {   LPFN_GLPI glpi;
@@ -120,7 +120,7 @@ int UTIL_countAvailableCores(void)
 int UTIL_countAvailableCores(void)
 {
     time_t currTime = time(NULL);
-    if (lastTimeCached && currTime-lastTimeCached>=util_cpuCoresCacheTTL) numLogicalCores = 0;
+    if (lastTimeCached && currTime-lastTimeCached>util_cpuCoresCacheTTL) numLogicalCores = 0;
     if (numLogicalCores != 0) return numLogicalCores;
 
     {   size_t size = sizeof(int32_t);
@@ -148,7 +148,7 @@ int UTIL_countAvailableCores(void)
 int UTIL_countAvailableCores(void)
 {
     time_t currTime = time(NULL);
-    if (lastTimeCached && currTime-lastTimeCached>=util_cpuCoresCacheTTL) numLogicalCores = 0;
+    if (lastTimeCached && currTime-lastTimeCached>util_cpuCoresCacheTTL) numLogicalCores = 0;
 
     if (numLogicalCores != 0) {
         printdn("Stored static numLogicalCores: %d\n", numLogicalCores);
@@ -249,7 +249,7 @@ int UTIL_countAvailableCores(void)
 int UTIL_countAvailableCores(void)
 {
     time_t currTime = time(NULL);
-    if (lastTimeCached && currTime-lastTimeCached>=util_cpuCoresCacheTTL) numLogicalCores = 0;
+    if (lastTimeCached && currTime-lastTimeCached>util_cpuCoresCacheTTL) numLogicalCores = 0;
 
     if (numLogicalCores != 0) return numLogicalCores;
 
@@ -281,7 +281,7 @@ int UTIL_countAvailableCores(void)
 int UTIL_countAvailableCores(void)
 {
     time_t currTime = time(NULL);
-    if (lastTimeCached && currTime-lastTimeCached>=util_cpuCoresCacheTTL) numLogicalCores = 0;
+    if (lastTimeCached && currTime-lastTimeCached>util_cpuCoresCacheTTL) numLogicalCores = 0;
 
     if (numLogicalCores != 0) return numLogicalCores;