Merge remote-tracking branch 'origin/master'

peter-lawrey · peter-lawrey · commit 5baf067c66b2 · 2019-06-28T18:25:30.000+01:00
diff --git a/affinity-test/pom.xml b/affinity-test/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>java-parent-pom</artifactId>
-        <version>1.1.16</version>
+        <version>1.1.22</version>
         <relativePath />
     </parent>
 
@@ -42,7 +42,7 @@
                 <groupId>net.openhft</groupId>
                 <artifactId>third-party-bom</artifactId>
                 <type>pom</type>
-                <version>3.6.5</version>
+                <version>3.6.9</version>
                 <scope>import</scope>
             </dependency>
             <dependency>
@@ -125,7 +125,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version>
                 <configuration>
                     <compilerArgument>-Xlint:deprecation</compilerArgument>
                     <source>1.8</source>
diff --git a/affinity/pom.xml b/affinity/pom.xml
@@ -20,8 +20,7 @@
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>java-parent-pom</artifactId>
-        <version>1.1.16</version>
-        <relativePath />
+        <version>1.1.22</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -43,7 +42,7 @@
                 <groupId>net.openhft</groupId>
                 <artifactId>third-party-bom</artifactId>
                 <type>pom</type>
-                <version>3.6.5</version>
+                <version>3.6.9</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>
@@ -90,11 +89,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version>
                 <configuration>
                     <compilerArgument>-Xlint:deprecation</compilerArgument>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
diff --git a/affinity/src/main/java/net/openhft/affinity/LockInventory.java b/affinity/src/main/java/net/openhft/affinity/LockInventory.java
@@ -83,8 +83,7 @@ public final synchronized void set(CpuLayout cpuLayout) {
         for (int i = 0; i < cpuLayout.cpus(); i++) {
             final boolean base = AffinityLock.BASE_AFFINITY.get(i);
             final boolean reservable = AffinityLock.RESERVED_AFFINITY.get(i);
-
-            LOGGER.trace("cpu " + i + " base={} reservable= {}", i, base, reservable);
+            LOGGER.trace("cpu {} base={} reservable= {}", i, base, reservable);
             AffinityLock lock = logicalCoreLocks[i] = newLock(i, base, reservable);
 
             int layoutId = lock.cpuId();
@@ -213,4 +212,4 @@ private void releaseAffinityLock(final Thread t, final AffinityLock al, final St
 
         LockCheck.releaseLock(al.cpuId());
     }
-}
+}
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java b/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java
@@ -66,7 +66,11 @@ cpu_set_t sched_getaffinity() {
         return cpuset;
     }
 
-    public static void sched_setaffinity(final BitSet affinity) {
+	public static void sched_setaffinity(final BitSet affinity) {
+		sched_setaffinity(0, affinity);
+	}
+	
+    public static void sched_setaffinity(final int pid, final BitSet affinity) {
         final CLibrary lib = CLibrary.INSTANCE;
         final cpu_set_t cpuset = new cpu_set_t();
         final int size = version.isSameOrNewer(VERSION_2_6) ? cpu_set_t.SIZE_OF_CPU_SET_T : NativeLong.SIZE;
@@ -80,12 +84,12 @@ public static void sched_setaffinity(final BitSet affinity) {
             }
         }
         try {
-            if (lib.sched_setaffinity(0, size, cpuset) != 0) {
-                throw new IllegalStateException("sched_setaffinity(0, " + size +
+            if (lib.sched_setaffinity(pid, size, cpuset) != 0) {
+                throw new IllegalStateException("sched_setaffinity(" + pid + ", " + size +
                         ", 0x" + Utilities.toHexString(affinity) + ") failed; errno=" + Native.getLastError());
             }
         } catch (LastErrorException e) {
-            throw new IllegalStateException("sched_setaffinity(0, " + size +
+            throw new IllegalStateException("sched_setaffinity(" + pid + ", " + size +
                     ", 0x" + Utilities.toHexString(affinity) + ") failed; errno=" + e.getErrorCode(), e);
         }
     }
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>root-parent-pom</artifactId>
-        <version>1.1.12</version>
+        <version>1.2.1</version>
         <relativePath />
     </parent>
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,11 @@ cpu_set_t sched_getaffinity() {`
`66`	`66`	`return cpuset;`
`67`	`67`	`}`
`68`	`68`
`69`		`- public static void sched_setaffinity(final BitSet affinity) {`
	`69`	`+ public static void sched_setaffinity(final BitSet affinity) {`
	`70`	`+ sched_setaffinity(0, affinity);`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ public static void sched_setaffinity(final int pid, final BitSet affinity) {`
`70`	`74`	`final CLibrary lib = CLibrary.INSTANCE;`
`71`	`75`	`final cpu_set_t cpuset = new cpu_set_t();`
`72`	`76`	`final int size = version.isSameOrNewer(VERSION_2_6) ? cpu_set_t.SIZE_OF_CPU_SET_T : NativeLong.SIZE;`
`@@ -80,12 +84,12 @@ public static void sched_setaffinity(final BitSet affinity) {`
`80`	`84`	`}`
`81`	`85`	`}`
`82`	`86`	`try {`
`83`		`- if (lib.sched_setaffinity(0, size, cpuset) != 0) {`
`84`		`- throw new IllegalStateException("sched_setaffinity(0, " + size +`
	`87`	`+ if (lib.sched_setaffinity(pid, size, cpuset) != 0) {`
	`88`	`+ throw new IllegalStateException("sched_setaffinity(" + pid + ", " + size +`
`85`	`89`	`", 0x" + Utilities.toHexString(affinity) + ") failed; errno=" + Native.getLastError());`
`86`	`90`	`}`
`87`	`91`	`} catch (LastErrorException e) {`
`88`		`- throw new IllegalStateException("sched_setaffinity(0, " + size +`
	`92`	`+ throw new IllegalStateException("sched_setaffinity(" + pid + ", " + size +`
`89`	`93`	`", 0x" + Utilities.toHexString(affinity) + ") failed; errno=" + e.getErrorCode(), e);`
`90`	`94`	`}`
`91`	`95`	`}`