Refactor CPU ID validation in AffinityLock and enhance test cases for invalid inputs

peter-lawrey · peter-lawrey · commit fa423ea52ad4 · 2025-06-03T10:57:12.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,14 +186,17 @@ public static AffinityLock acquireLock(boolean bind) {
      * @return A handle for an affinity lock.
      */
     public static AffinityLock acquireLock(int cpuId) {
-        checkCpuId(cpuId);
+        if (isInvalidCpuId(cpuId))
+            return LOCK_INVENTORY.noLock();
         return acquireLock(true, cpuId, AffinityStrategies.ANY);
     }
 
-    private static void checkCpuId(int cpuId) {
+    private static boolean isInvalidCpuId(int cpuId) {
         if (cpuId < 0 || cpuId >= PROCESSORS) {
             LOGGER.warn("cpuId must be between 0 and {}: {}", PROCESSORS - 1, cpuId);
+            return true;
         }
+        return false;
     }
 
     /**
@@ -207,7 +210,7 @@ private static void checkCpuId(int cpuId) {
      */
     public static AffinityLock acquireLock(int[] cpus) {
         for (int cpu : cpus) {
-            checkCpuId(cpu);
+            if (isInvalidCpuId(cpu)) continue;
             AffinityLock lock = tryAcquireLock(true, cpu);
             if (lock != null) {
                 LOGGER.info("Acquired lock on CPU {}", cpu);
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
@@ -310,19 +310,22 @@ public void acquireLockWithoutBindingDoesNotChangeAffinity() {
         assertEquals(before, Affinity.getAffinity());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testTooHighCpuId() {
-        AffinityLock.acquireLock(123456);
-        }
+        AffinityLock lock = AffinityLock.acquireLock(123456);
+        assertFalse(lock.isBound());
+    }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testNegativeCpuId() {
-        AffinityLock.acquireLock(-1);
+        AffinityLock lock = AffinityLock.acquireLock(-1);
+        assertFalse(lock.isBound());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testTooHighCpuId2() {
-        AffinityLock.acquireLock(new int[]{123456});
+        AffinityLock lock = AffinityLock.acquireLock(new int[]{-1, 123456});
+        assertFalse(lock.isBound());
     }
 
     @Test(expected = IllegalStateException.class)
@@ -341,6 +344,7 @@ public void bindingTwoThreadsToSameCpuThrows() throws InterruptedException {
         t.start();
 
         while (!lock.isBound()) {
+            //noinspection BusyWait
             Thread.sleep(10);
         }
 
