Refactor AffinityLock methods to improve CPU ID validation and logging

peter-lawrey · peter-lawrey · commit 2d931c38d841 · 2025-06-03T10:50:41.000+01:00
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -186,10 +186,14 @@ public static AffinityLock acquireLock(boolean bind) {
      * @return A handle for an affinity lock.
      */
     public static AffinityLock acquireLock(int cpuId) {
+        checkCpuId(cpuId);
+        return acquireLock(true, cpuId, AffinityStrategies.ANY);
+    }
+
+    private static void checkCpuId(int cpuId) {
         if (cpuId < 0 || cpuId >= PROCESSORS) {
-            throw new IllegalArgumentException("cpuId must be between 0 and " + (PROCESSORS - 1) + ": " + cpuId);
+            LOGGER.warn("cpuId must be between 0 and {}: {}", PROCESSORS - 1, cpuId);
         }
-        return acquireLock(true, cpuId, AffinityStrategies.ANY);
     }
 
     /**
@@ -203,9 +207,7 @@ public static AffinityLock acquireLock(int cpuId) {
      */
     public static AffinityLock acquireLock(int[] cpus) {
         for (int cpu : cpus) {
-            if (cpu < 0 || cpu >= PROCESSORS) {
-                throw new IllegalArgumentException("cpuId must be between 0 and " + (PROCESSORS - 1) + ": " + cpu);
-            }
+            checkCpuId(cpu);
             AffinityLock lock = tryAcquireLock(true, cpu);
             if (lock != null) {
                 LOGGER.info("Acquired lock on CPU {}", cpu);
@@ -265,7 +267,7 @@ public static AffinityLock acquireLock(String desc) {
 
         } else if (desc.startsWith("csv:")) {
             String content = desc.substring(4);
-            int[] cpus = Arrays.asList(content.split(",")).stream()
+            int[] cpus = Arrays.stream(content.split(","))
                     .map(String::trim)
                     .mapToInt(Integer::parseInt).toArray();
 
