Improve logging of errors

peter-lawrey · peter-lawrey · commit 4f775df33456 · 2012-01-09T15:50:43.000Z
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>vanilla.java</groupId>
     <artifactId>affinity</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <packaging>jar</packaging>
 
     <licenses>
diff --git a/src/main/java/vanilla/java/affinity/impl/NativeAffinity.java b/src/main/java/vanilla/java/affinity/impl/NativeAffinity.java
@@ -36,8 +36,8 @@ public enum NativeAffinity implements IAffinity {
             System.loadLibrary("affinity");
             loaded = true;
         } catch (UnsatisfiedLinkError ule) {
-            if (LOGGER.isLoggable(Level.FINE))
-                LOGGER.fine("Unable to find libaffinity in " + System.getProperty("java.library.path") + " " + ule);
+            if (LOGGER.isLoggable(Level.INFO))
+                LOGGER.info("Unable to find libaffinity in " + System.getProperty("java.library.path") + " " + ule);
             loaded = false;
         }
         LOADED = loaded;
diff --git a/src/main/java/vanilla/java/affinity/impl/PosixJNAAffinity.java b/src/main/java/vanilla/java/affinity/impl/PosixJNAAffinity.java
@@ -67,7 +67,7 @@ public int sched_getaffinity(final int pid,
             INSTANCE.getAffinity();
             loaded = true;
         } catch (UnsatisfiedLinkError e) {
-            LOGGER.log(Level.WARNING, "Unable to load jna library", e);
+            LOGGER.log(Level.WARNING, "Unable to load jna library " + e);
         }
         LOADED = loaded;
     }
diff --git a/src/main/java/vanilla/java/clock/ClockSupport.java b/src/main/java/vanilla/java/clock/ClockSupport.java
@@ -27,13 +27,13 @@
  * @since 29.12.11,  19:02
  */
 public final class ClockSupport {
-    private static final IClock CLOCK_IMPL;
+    public static final IClock INSTANCE;
 
     static {
         if (JNIClock.LOADED) {
-            CLOCK_IMPL = JNIClock.INSTANCE;
+            INSTANCE = JNIClock.INSTANCE;
         } else {
-            CLOCK_IMPL = SystemClock.INSTANCE;
+            INSTANCE = SystemClock.INSTANCE;
         }
     }
 
@@ -42,6 +42,6 @@ public final class ClockSupport {
      * @see vanilla.java.clock.IClock#nanoTime()
      */
     public static long nanoTime() {
-        return CLOCK_IMPL.nanoTime();
+        return INSTANCE.nanoTime();
     }
 }
diff --git a/src/test/java/vanilla/java/affinity/AffinitySupportMain.java b/src/test/java/vanilla/java/affinity/AffinitySupportMain.java
@@ -0,0 +1,30 @@
+package vanilla.java.affinity;
+
+/**
+ * @author peter.lawrey
+ */
+public class AffinitySupportMain {
+    public static void main(String... args) {
+        AffinityLock al = AffinityLock.acquireLock();
+        try {
+            new Thread(new SleepRunnable(), "reader").start();
+            new Thread(new SleepRunnable(), "writer").start();
+            new Thread(new SleepRunnable(), "engine").start();
+        } finally {
+            al.release();
+        }
+        System.out.println("\nThe assignment of CPUs is\n" + AffinityLock.dumpLocks());
+    }
+
+    private static class SleepRunnable implements Runnable {
+        public void run() {
+            AffinityLock al = AffinityLock.acquireLock();
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+            } finally {
+                al.release();
+            }
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public int sched_getaffinity(final int pid,`
`67`	`67`	`INSTANCE.getAffinity();`
`68`	`68`	`loaded = true;`
`69`	`69`	`} catch (UnsatisfiedLinkError e) {`
`70`		`- LOGGER.log(Level.WARNING, "Unable to load jna library", e);`
	`70`	`+ LOGGER.log(Level.WARNING, "Unable to load jna library " + e);`
`71`	`71`	`}`
`72`	`72`	`LOADED = loaded;`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@`
`27`	`27`	`* @since 29.12.11, 19:02`
`28`	`28`	`*/`
`29`	`29`	`public final class ClockSupport {`
`30`		`- private static final IClock CLOCK_IMPL;`
	`30`	`+ public static final IClock INSTANCE;`
`31`	`31`
`32`	`32`	`static {`
`33`	`33`	`if (JNIClock.LOADED) {`
`34`		`- CLOCK_IMPL = JNIClock.INSTANCE;`
	`34`	`+ INSTANCE = JNIClock.INSTANCE;`
`35`	`35`	`} else {`
`36`		`- CLOCK_IMPL = SystemClock.INSTANCE;`
	`36`	`+ INSTANCE = SystemClock.INSTANCE;`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`@@ -42,6 +42,6 @@ public final class ClockSupport {`
`42`	`42`	`* @see vanilla.java.clock.IClock#nanoTime()`
`43`	`43`	`*/`
`44`	`44`	`public static long nanoTime() {`
`45`		`- return CLOCK_IMPL.nanoTime();`
	`45`	`+ return INSTANCE.nanoTime();`
`46`	`46`	`}`
`47`	`47`	`}`