Merge branch 'master' of https://github.com/msalvagna/Java-Thread-Affinity into solaris-getThreadId

msalvagna · msalvagna · commit e1a0c25fc818 · 2014-12-01T09:29:06.000-05:00
# By Peter Lawrey # Via Peter Lawrey * 'master' of https://github.com/msalvagna/Java-Thread-Affinity: Remove blank lines at the start of methods and loops. Remove blank lines before } Remove double and triple blank lines
diff --git a/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiBundleTest.java b/affinity-test/src/test/java/net/openhft/affinity/osgi/OSGiBundleTest.java
@@ -17,7 +17,6 @@
  */
 package net.openhft.affinity.osgi;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -26,13 +25,11 @@
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
-import java.util.Dictionary;
 import javax.inject.Inject;
 
 import static org.junit.Assert.*;
 import static org.ops4j.pax.exam.CoreOptions.*;
 
-
 //@Ignore
 @RunWith(PaxExam.class)
 public class OSGiBundleTest extends net.openhft.affinity.osgi.OSGiTestBase {
diff --git a/affinity/src/main/java/java/lang/ThreadLifecycleListener.java b/affinity/src/main/java/java/lang/ThreadLifecycleListener.java
@@ -18,7 +18,6 @@
 
 package java.lang;
 
-
 /**
  * A listener for various events in a Thread's life: creation, termination, etc.
  */
diff --git a/affinity/src/main/java/net/openhft/affinity/AffinityLock.java b/affinity/src/main/java/net/openhft/affinity/AffinityLock.java
@@ -292,7 +292,6 @@ else if (base)
     }
 
     public static void main(String[] args) {
-
         System.out.println("Test");
     }
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java b/affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java
@@ -30,7 +30,6 @@ public static class utsname extends Structure {
                 "domainname"
         );
 
-
         /** Name of the implementation of the operating system.  */
         public byte[] sysname = new byte[_UTSNAME_LENGTH];
 
@@ -87,7 +86,6 @@ public String getRealeaseVersion() {
                 break;
             }
             return release.substring(0, len);
-
         }
 
         public String getVersion() {
@@ -172,7 +170,6 @@ public static void __CPU_CLR(int cpu, cpu_set_t cpuset ) {
         public static boolean __CPU_ISSET(int cpu, cpu_set_t cpuset ) {
             return (cpuset.__bits[__CPUELT(cpu)].longValue() & __CPUMASK(cpu)) != 0;
         }
-
     }
 
     interface CLibrary extends Library {
@@ -267,7 +264,6 @@ public static int sched_getcpu() {
                 }
             }
         }
-
     }
 
     public static int getpid() {
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/LinuxJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/LinuxJNAAffinity.java
@@ -1,11 +1,10 @@
 package net.openhft.affinity.impl;
 
-import com.sun.jna.*;
+import com.sun.jna.Platform;
 import net.openhft.affinity.IAffinity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public enum LinuxJNAAffinity implements IAffinity {
     INSTANCE;
     private static final Logger LOGGER = LoggerFactory.getLogger(LinuxJNAAffinity.class);
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/NullAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/NullAffinity.java
@@ -18,7 +18,6 @@
 
 package net.openhft.affinity.impl;
 
-
 import net.openhft.affinity.IAffinity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -58,5 +57,4 @@ public int getThreadId() {
         throw new UnsupportedOperationException();
     }
 
-
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/OSXJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/OSXJNAAffinity.java
@@ -18,7 +18,6 @@
 
 package net.openhft.affinity.impl;
 
-
 import com.sun.jna.LastErrorException;
 import com.sun.jna.Library;
 import com.sun.jna.Native;
@@ -76,6 +75,5 @@ interface CLibrary extends Library {
                 Native.loadLibrary("libpthread.dylib", CLibrary.class);
 
         int pthread_self() throws LastErrorException;
-
     }
 }
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/PosixJNAAffinity.java
@@ -177,7 +177,6 @@ private static boolean is64Bit0() {
         return systemProp != null && systemProp.contains("_64");
     }
 
-
     /**
      * @author BegemoT
      */
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/VanillaCpuLayout.java b/affinity/src/main/java/net/openhft/affinity/impl/VanillaCpuLayout.java
@@ -63,7 +63,6 @@ public class VanillaCpuLayout implements CpuLayout {
             }
             throw new AssertionError(error);
         }
-
     }
 
     @NotNull
diff --git a/affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java b/affinity/src/main/java/net/openhft/affinity/impl/WindowsJNAAffinity.java
@@ -55,7 +55,6 @@ public long getAffinity() {
                 throw new IllegalStateException("GetProcessAffinityMask(( -1 ), &(" + cpuset1 + "), &(" + cpuset2 + ") ) return " + ret);
 
             return cpuset1.getValue();
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -70,7 +69,6 @@ public void setAffinity(final long affinity) {
         int pid = getTid();
         try {
             lib.SetThreadAffinityMask(pid, aff);
-
         } catch (LastErrorException e) {
             throw new IllegalStateException("SetThreadAffinityMask((" + pid + ") , &(" + affinity + ") ) errorNo=" + e.getErrorCode(), e);
         }
@@ -81,13 +79,11 @@ public int getTid() {
 
         try {
             return lib.GetCurrentThread();
-
         } catch (LastErrorException e) {
             throw new IllegalStateException("GetCurrentThread( ) errorNo=" + e.getErrorCode(), e);
         }
     }
 
-
     @Override
     public int getCpu() {
         return -1;
@@ -106,7 +102,6 @@ public int getThreadId() {
         return tid;
     }
 
-
     /**
      * @author BegemoT
      */
diff --git a/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java b/affinity/src/test/java/net/openhft/affinity/impl/AbstractAffinityImplTest.java
@@ -25,7 +25,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-
 /**
  * @author cheremin
  * @since 29.12.11,  20:25
@@ -36,7 +35,6 @@ public abstract class AbstractAffinityImplTest {
 
     public abstract IAffinity getImpl();
 
-
     @Test
     public void getAffinityCompletesGracefully() throws Exception {
         getImpl().getAffinity();
diff --git a/affinity/src/test/java/net/openhft/affinity/impl/VanillaCpuLayoutTest.java b/affinity/src/test/java/net/openhft/affinity/impl/VanillaCpuLayoutTest.java
@@ -44,7 +44,6 @@ public void testFromCpuInfoI7() throws IOException {
                 "7: CpuInfo{socketId=0, coreId=3, threadId=1}\n", vcl.toString());
     }
 
-
     @Test
     public void testFromCpuInfoOthers() throws IOException {
         {
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,6 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>root-parent-pom</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,6 @@ else if (base)`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`public static void main(String[] args) {`
`295`		`-`
`296`	`295`	`System.out.println("Test");`
`297`	`296`	`}`
`298`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public static class utsname extends Structure {`
`30`	`30`	`"domainname"`
`31`	`31`	`);`
`32`	`32`
`33`		`-`
`34`	`33`	`/** Name of the implementation of the operating system. */`
`35`	`34`	`public byte[] sysname = new byte[_UTSNAME_LENGTH];`
`36`	`35`
`@@ -87,7 +86,6 @@ public String getRealeaseVersion() {`
`87`	`86`	`break;`
`88`	`87`	`}`
`89`	`88`	`return release.substring(0, len);`
`90`		`-`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`public String getVersion() {`
`@@ -172,7 +170,6 @@ public static void __CPU_CLR(int cpu, cpu_set_t cpuset ) {`
`172`	`170`	`public static boolean __CPU_ISSET(int cpu, cpu_set_t cpuset ) {`
`173`	`171`	`return (cpuset.__bits[__CPUELT(cpu)].longValue() & __CPUMASK(cpu)) != 0;`
`174`	`172`	`}`
`175`		`-`
`176`	`173`	`}`
`177`	`174`
`178`	`175`	`interface CLibrary extends Library {`
`@@ -267,7 +264,6 @@ public static int sched_getcpu() {`
`267`	`264`	`}`
`268`	`265`	`}`
`269`	`266`	`}`
`270`		`-`
`271`	`267`	`}`
`272`	`268`
`273`	`269`	`public static int getpid() {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`
`19`	`19`	`package net.openhft.affinity.impl;`
`20`	`20`
`21`		`-`
`22`	`21`	`import net.openhft.affinity.IAffinity;`
`23`	`22`	`import org.slf4j.Logger;`
`24`	`23`	`import org.slf4j.LoggerFactory;`
`@@ -58,5 +57,4 @@ public int getThreadId() {`
`58`	`57`	`throw new UnsupportedOperationException();`
`59`	`58`	`}`
`60`	`59`
`61`		`-`
`62`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ private static boolean is64Bit0() {`
`177`	`177`	`return systemProp != null && systemProp.contains("_64");`
`178`	`178`	`}`
`179`	`179`
`180`		`-`
`181`	`180`	`/**`
`182`	`181`	`* @author BegemoT`
`183`	`182`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ public class VanillaCpuLayout implements CpuLayout {`
`63`	`63`	`}`
`64`	`64`	`throw new AssertionError(error);`
`65`	`65`	`}`
`66`		`-`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`@NotNull`