AFFINITY-6 Minor changes to further facilitate reuse

JozsefBartokHFT · JozsefBartokHFT · commit 4e8bf9cc7a0b · 2014-04-30T08:55:26.000+03:00
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -44,7 +44,7 @@ public class AffinityLock {
     public static final long BASE_AFFINITY = AffinitySupport.getAffinity();
     public static final long RESERVED_AFFINITY = getReservedAffinity0();
 
-    static final LockInventory LOCK_INVENTORY = new LockInventory(new NoCpuLayout(PROCESSORS));
+    private static final LockInventory LOCK_INVENTORY = new LockInventory(new NoCpuLayout(PROCESSORS));
 
     static {
         try {
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -7,7 +7,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-class LockInventory { //todo: review and simplify code
+class LockInventory {
 
     private static final Logger LOGGER = Logger.getLogger(LockInventory.class.getName());
 
@@ -43,7 +43,7 @@ public final synchronized void set(CpuLayout cpuLayout) {
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.fine("cpu " + i + " base= " + base + " reservable= " + reservable);
             }
-            AffinityLock lock = logicalCoreLocks[i] = new AffinityLock(i, base, reservable, this);
+            AffinityLock lock = logicalCoreLocks[i] = newLock(i, base, reservable);
 
             int layoutId = lock.cpuId();
             int physicalCore = toPhysicalCore(layoutId);
@@ -70,7 +70,7 @@ public final synchronized AffinityLock acquireLock(boolean bind, int cpuId, Affi
         if (LOGGER.isLoggable(Level.WARNING)) {
             LOGGER.warning("No reservable CPU for " + Thread.currentThread());
         }
-        return new AffinityLock(-1, false, false, this);
+        return newLock(-1, false, false);
     }
 
     public final synchronized AffinityLock acquireCore(boolean bind, int cpuId, AffinityStrategy... strategies) {
@@ -137,6 +137,10 @@ public final synchronized String dumpLocks() {
         return dumpLocks(logicalCoreLocks);
     }
 
+    protected AffinityLock newLock(int cpuId, boolean base, boolean reservable) {
+        return new AffinityLock(cpuId, base, reservable, this);
+    }
+
     private void reset(CpuLayout cpuLayout) {
         this.cpuLayout = cpuLayout;
         this.logicalCoreLocks = new AffinityLock[cpuLayout.cpus()];
