Merge pull request OpenHFT#50 from mprusakov/patch-2

dpisklov · web-flow · commit 18d18fa8dbac · 2019-05-15T09:28:46.000+01:00
Allow thread pinning by pid
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);
         }
     }

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`	`}`