Merge pull request #179 from OpenHFT/added-tests

Added tests for edge cases

Author: peter-lawrey

affinity/pom.xml

@@ -110,6 +110,10 @@
         <profile>
             <id>make-c</id>
             <activation>
+                <os>
+                    <family>linux</family>
+                    <arch>!arm</arch>
+                </os>
                 <property>
                     <name>!dontMake</name>
                 </property>

affinity/src/main/java/net/openhft/affinity/AffinityLock.java

@@ -69,6 +69,7 @@ public class AffinityLock implements Closeable {
      * Logical ID of the CPU to which this lock belongs to.
      */
     private final int cpuId;
+    private final int cpuId2;
     /**
      * CPU to which this lock belongs to is of general use.
      */
@@ -88,9 +89,10 @@ public class AffinityLock implements Closeable {
     Throwable boundHere;
     private boolean resetAffinity = true;
 
-    AffinityLock(int cpuId, boolean base, boolean reservable, LockInventory lockInventory) {
+    AffinityLock(int cpuId, int cpuId2, boolean base, boolean reservable, LockInventory lockInventory) {
         this.lockInventory = lockInventory;
         this.cpuId = cpuId;
+        this.cpuId2 = cpuId2;
         this.base = base;
         this.reservable = reservable;
     }
@@ -133,7 +135,7 @@ private static BitSet getReservedAffinity0() {
         int end = reservedAffinity.length();
         for (int i = 0; i < longs.length; i++) {
             int begin = Math.max(0, end - 16);
-            longs[i] = Long.parseLong(reservedAffinity.substring(begin, end), 16);
+            longs[i] = Long.parseUnsignedLong(reservedAffinity.substring(begin, end), 16);
             end = begin;
         }
         return BitSet.valueOf(longs);
@@ -183,17 +185,20 @@ public static AffinityLock acquireLock(boolean bind) {
      * for defining your thread layout centrally and passing the handle via dependency injection.
      *
      * @param cpuId the CPU id to bind to
-     * @return A handle for an affinity lock.
+     * @return A handle for an affinity lock, or no lock if no available CPU in the array
      */
     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 +212,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);
@@ -471,6 +476,10 @@ public int cpuId() {
         return cpuId;
     }
 
+    public int cpuId2() {
+        return cpuId2;
+    }
+
     /**
      * @return Was a cpu found to bind this lock to.
      */

affinity/src/main/java/net/openhft/affinity/BootClassPath.java

@@ -21,7 +21,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Collections;
@@ -39,21 +41,56 @@ enum BootClassPath {
     private static Set<String> getResourcesOnBootClasspath() {
         final Logger logger = LoggerFactory.getLogger(BootClassPath.class);
         final Set<String> resources = new HashSet<>();
+
         final String bootClassPath = System.getProperty("sun.boot.class.path", "");
-        logger.trace("Boot class-path is: {}", bootClassPath);
+        if (!bootClassPath.isEmpty()) {
+            logger.trace("Boot class-path is: {}", bootClassPath);
 
-        final String pathSeparator = System.getProperty("path.separator");
-        logger.trace("Path separator is: '{}'", pathSeparator);
+            final String pathSeparator = File.pathSeparator;
+            logger.trace("Path separator is: '{}'", pathSeparator);
 
-        final String[] pathElements = bootClassPath.split(pathSeparator);
+            final String[] pathElements = bootClassPath.split(pathSeparator);
 
-        for (final String pathElement : pathElements) {
-            resources.addAll(findResources(Paths.get(pathElement), logger));
+            for (final String pathElement : pathElements) {
+                resources.addAll(findResources(Paths.get(pathElement), logger));
+            }
+        } else {
+            resources.addAll(findResourcesInJrt(logger));
         }
 
         return resources;
     }
 
+    private static Set<String> findResourcesInJrt(final Logger logger) {
+        final Set<String> jrtResources = new HashSet<>();
+        try {
+            FileSystem fs;
+            try {
+                fs = FileSystems.getFileSystem(URI.create("jrt:/"));
+            } catch (FileSystemNotFoundException | ProviderNotFoundException e) {
+                fs = FileSystems.newFileSystem(URI.create("jrt:/"), Collections.emptyMap());
+            }
+            final Path modules = fs.getPath("/modules");
+            Files.walkFileTree(modules, new SimpleFileVisitor<Path>() {
+                @Override
+                public @NotNull FileVisitResult visitFile(final @NotNull Path file,
+                                                          final @NotNull BasicFileAttributes attrs) throws IOException {
+                    if (file.getFileName().toString().endsWith(".class")) {
+                        Path relative = modules.relativize(file);
+                        if (relative.getNameCount() > 1) {
+                            Path classPath = relative.subpath(1, relative.getNameCount());
+                            jrtResources.add(classPath.toString());
+                        }
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        } catch (IOException e) {
+            logger.warn("Error walking jrt filesystem", e);
+        }
+        return jrtResources;
+    }
+
     private static Set<String> findResources(final Path path, final Logger logger) {
         if (!Files.exists(path)) {
             return Collections.emptySet();

affinity/src/main/java/net/openhft/affinity/CpuLayout.java

@@ -49,4 +49,10 @@ public interface CpuLayout {
      * @return which thread on a core this cpu is on.
      */
     int threadId(int cpuId);
+
+    /**
+     * @param cpuId the logical processor number
+     * @return the hyperthreaded pair number or 0 if not hyperthreaded.
+     */
+    int pair(int cpuId);
 }

affinity/src/main/java/net/openhft/affinity/LockCheck.java

@@ -17,6 +17,7 @@
 
 package net.openhft.affinity;
 
+import net.openhft.affinity.impl.Utilities;
 import net.openhft.affinity.lockchecker.FileLockBasedLockChecker;
 import net.openhft.affinity.lockchecker.LockChecker;
 import org.slf4j.Logger;
@@ -39,9 +40,7 @@ public enum LockCheck {
     private static final LockChecker lockChecker = FileLockBasedLockChecker.getInstance();
 
     public static long getPID() {
-        String processName =
-                java.lang.management.ManagementFactory.getRuntimeMXBean().getName();
-        return Long.parseLong(processName.split("@")[0]);
+        return Utilities.currentProcessId();
     }
 
     static boolean canOSSupportOperation() {
@@ -55,8 +54,8 @@ public static boolean isCpuFree(int cpu) {
         return isLockFree(cpu);
     }
 
-    static boolean replacePid(int cpu, long processID) throws IOException {
-        return storePid(processID, cpu);
+    static boolean replacePid(int cpu, int cpu2, long processID) throws IOException {
+        return storePid(processID, cpu, cpu2);
     }
 
     public static boolean isProcessRunning(long pid) {
@@ -70,15 +69,18 @@ public static boolean isProcessRunning(long pid) {
      * stores the pid in a file, named by the core, the pid is written to the file with the date
      * below
      */
-    private synchronized static boolean storePid(long processID, int cpu) throws IOException {
-        return lockChecker.obtainLock(cpu, Long.toString(processID));
+    private synchronized static boolean storePid(long processID, int cpu, int cpu2) throws IOException {
+        return lockChecker.obtainLock(cpu, cpu2, Long.toString(processID));
     }
 
     private synchronized static boolean isLockFree(int id) {
         return lockChecker.isLockFree(id);
     }
 
     public static int getProcessForCpu(int core) throws IOException {
+        if (!canOSSupportOperation())
+            return EMPTY_PID;
+
         String meta = lockChecker.getMetaInfo(core);
 
         if (meta != null && !meta.isEmpty()) {
@@ -91,10 +93,10 @@ public static int getProcessForCpu(int core) throws IOException {
         return EMPTY_PID;
     }
 
-    static boolean updateCpu(int cpu) throws IOException {
+    static boolean updateCpu(int cpu, int cpu2) throws IOException {
         if (!canOSSupportOperation())
             return true;
-        return replacePid(cpu, getPID());
+        return replacePid(cpu, cpu2, getPID());
     }
 
     public static void releaseLock(int cpu) {

affinity/src/main/java/net/openhft/affinity/LockInventory.java

@@ -82,7 +82,7 @@ private static boolean isAnyCpu(final int cpuId) {
      */
     private static boolean updateLockForCurrentThread(final boolean bind, final AffinityLock al, final boolean wholeCore) throws ClosedByInterruptException {
         try {
-            if (LockCheck.updateCpu(al.cpuId())) {
+            if (LockCheck.updateCpu(al.cpuId(), wholeCore ? al.cpuId2() : 0)) {
                 al.assignCurrentThread(bind, wholeCore);
                 return true;
             }
@@ -108,7 +108,9 @@ public final synchronized void set(CpuLayout cpuLayout) {
             final boolean base = AffinityLock.BASE_AFFINITY.get(i);
             final boolean reservable = AffinityLock.RESERVED_AFFINITY.get(i);
             LOGGER.trace("cpu {} base={} reservable= {}", i, base, reservable);
-            AffinityLock lock = logicalCoreLocks[i] = newLock(i, base, reservable);
+            assert logicalCoreLocks != null;
+            @SuppressWarnings("resource")
+            AffinityLock lock = logicalCoreLocks[i] = newLock(i, cpuLayout.pair(i), base, reservable);
 
             int layoutId = lock.cpuId();
             int physicalCore = toPhysicalCore(layoutId);
@@ -277,8 +279,8 @@ public final synchronized String dumpLocks() {
         return dumpLocks(logicalCoreLocks);
     }
 
-    protected AffinityLock newLock(int cpuId, boolean base, boolean reservable) {
-        return new AffinityLock(cpuId, base, reservable, this);
+    protected AffinityLock newLock(int cpuId, int cpuId2, boolean base, boolean reservable) {
+        return new AffinityLock(cpuId, cpuId2, base, reservable, this);
     }
 
     private void reset(CpuLayout cpuLayout) {
@@ -301,6 +303,6 @@ private void releaseAffinityLock(final Thread t, final AffinityLock al, final St
     }
 
     public AffinityLock noLock() {
-        return newLock(AffinityLock.ANY_CPU, false, false);
+        return newLock(AffinityLock.ANY_CPU, 0, false, false);
     }
 }

affinity/src/main/java/net/openhft/affinity/impl/NoCpuLayout.java

@@ -64,4 +64,9 @@ public int coreId(int cpuId) {
     public int threadId(int cpuId) {
         return 0;
     }
+
+    @Override
+    public int pair(int cpuId) {
+        return 0;
+    }
 }

affinity/src/main/java/net/openhft/affinity/impl/NullAffinity.java

@@ -21,7 +21,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.management.ManagementFactory;
 import java.util.BitSet;
 
 /**
@@ -48,8 +47,7 @@ public int getCpu() {
 
     @Override
     public int getProcessId() {
-        final String name = ManagementFactory.getRuntimeMXBean().getName();
-        return Integer.parseInt(name.split("@")[0]);
+        return Utilities.currentProcessId();
     }
 
     @Override

affinity/src/main/java/net/openhft/affinity/impl/OSXJNAAffinity.java

@@ -24,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.management.ManagementFactory;
 import java.util.BitSet;
 
 /**
@@ -55,8 +54,7 @@ public int getCpu() {
 
     @Override
     public int getProcessId() {
-        final String name = ManagementFactory.getRuntimeMXBean().getName();
-        return Integer.parseInt(name.split("@")[0]);
+        return Utilities.currentProcessId();
     }
 
     @Override

affinity/src/main/java/net/openhft/affinity/impl/SolarisJNAAffinity.java

@@ -24,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.management.ManagementFactory;
 import java.util.BitSet;
 
 /**
@@ -55,8 +54,7 @@ public int getCpu() {
 
     @Override
     public int getProcessId() {
-        final String name = ManagementFactory.getRuntimeMXBean().getName();
-        return Integer.parseInt(name.split("@")[0]);
+        return Utilities.currentProcessId();
     }
 
     @Override

affinity/src/main/java/net/openhft/affinity/impl/Utilities.java

@@ -79,4 +79,30 @@ private static boolean is64Bit0() {
         systemProp = System.getProperty("java.vm.version");
         return systemProp != null && systemProp.contains("_64");
     }
+
+    /**
+     * Returns the current process id. Uses {@code ProcessHandle} when running
+     * on Java 9 or later and falls back to parsing
+     * {@code RuntimeMXBean#getName()} on earlier versions.
+     *
+     * @return the process id or {@code -1} if it cannot be determined
+     */
+    public static int currentProcessId() {
+        try {
+            // Java 9+ provides ProcessHandle which has a pid() method.
+            Class<?> phClass = Class.forName("java.lang.ProcessHandle");
+            Object current = phClass.getMethod("current").invoke(null);
+            long pid = (Long) phClass.getMethod("pid").invoke(current);
+            return (int) pid;
+        } catch (Throwable ignored) {
+            // ignore and fallback to the pre-Java 9 approach
+        }
+
+        try {
+            String name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();
+            return Integer.parseInt(name.split("@")[0]);
+        } catch (Throwable e) {
+            return -1;
+        }
+    }
 }

affinity/src/main/java/net/openhft/affinity/impl/VanillaCpuLayout.java

@@ -177,6 +177,19 @@ public int threadId(int cpuId) {
         return cpuDetails.get(cpuId).threadId;
     }
 
+    @Override
+    public int pair(int cpuId) {
+        for (int i = 0; i < cpuDetails.size(); i++) {
+            CpuInfo info = cpuDetails.get(i);
+            if (info.socketId == cpuDetails.get(cpuId).socketId &&
+                    info.coreId == cpuDetails.get(cpuId).coreId &&
+                    info.threadId != cpuDetails.get(cpuId).threadId) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
     @NotNull
     @Override
     public String toString() {

affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java

@@ -89,8 +89,9 @@ public void setAffinity(final BitSet affinity) {
             throw new IllegalStateException("SetThreadAffinityMask((" + pid + ") , &(" + affinity + ") ) errorNo=" + e.getErrorCode(), e);
         }
         BitSet affinity2 = getAffinity0();
-        if (!affinity2.equals(affinity)) {
-            LoggerFactory.getLogger(WindowsJNAAffinity.class).warn("Tried to set affinity to " + affinity + " but was " + affinity2 + " you may have insufficient access rights");
+        assert affinity2 != null;
+        if (!affinity2.intersects(affinity)) {
+            LoggerFactory.getLogger(WindowsJNAAffinity.class).warn("Tried to set affinity to {} but was {} you may have insufficient access rights", affinity, affinity2);
         }
         currentAffinity.set((BitSet) affinity.clone());
     }