From bdc37294d92f89553efee9ff3db8dc60f6437754 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Mon, 9 Feb 2009 10:58:30 +0000
Subject: [PATCH] System.nanoTime() doesn't seem to work very well with
 HashedWheelTimer and multi-core system

---
 .../handler/timeout/HashedWheelTimer.java      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java b/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
index c329cae4b0..f4c6054926 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
@@ -103,7 +103,7 @@ public class HashedWheelTimer implements Timer {
         mask = wheel.length - 1;
 
         // Convert checkInterval to nanoseconds.
-        this.tickDuration = tickDuration = unit.toNanos(tickDuration);
+        this.tickDuration = tickDuration = unit.toMillis(tickDuration);
 
         // Prevent overflow.
         if (tickDuration == Long.MAX_VALUE ||
@@ -184,7 +184,7 @@ public class HashedWheelTimer implements Timer {
     }
 
     public Timeout newTimeout(TimerTask task, long delay, TimeUnit unit) {
-        final long currentTime = System.nanoTime();
+        final long currentTime = System.currentTimeMillis();
 
         if (task == null) {
             throw new NullPointerException("task");
@@ -193,7 +193,7 @@ public class HashedWheelTimer implements Timer {
             throw new NullPointerException("unit");
         }
 
-        delay = unit.toNanos(delay);
+        delay = unit.toMillis(delay);
         if (delay < tickDuration) {
             delay = tickDuration;
         }
@@ -243,7 +243,7 @@ public class HashedWheelTimer implements Timer {
             List<HashedWheelTimeout> expiredTimeouts =
                 new ArrayList<HashedWheelTimeout>();
 
-            startTime = System.nanoTime();
+            startTime = System.currentTimeMillis();
             tick = 1;
 
             while (!shutdown.get()) {
@@ -277,7 +277,7 @@ public class HashedWheelTimer implements Timer {
                 List<HashedWheelTimeout> expiredTimeouts,
                 ReusableIterator<HashedWheelTimeout> i) {
 
-            long currentTime = System.nanoTime();
+            long currentTime = System.currentTimeMillis();
             i.rewind();
             while (i.hasNext()) {
                 HashedWheelTimeout timeout = i.next();
@@ -310,7 +310,7 @@ public class HashedWheelTimer implements Timer {
 
         private void waitForNextTick() {
             for (;;) {
-                final long currentTime = System.nanoTime();
+                final long currentTime = System.currentTimeMillis();
                 final long sleepTime = tickDuration * tick - (currentTime - startTime);
 
                 if (sleepTime <= 0) {
@@ -328,7 +328,7 @@ public class HashedWheelTimer implements Timer {
 
             // Reset the tick if overflow is expected.
             if (tickDuration * tick > Long.MAX_VALUE - tickDuration) {
-                startTime = System.nanoTime();
+                startTime = System.currentTimeMillis();
                 tick = 1;
             } else {
                 // Increase the tick if overflow is not likely to happen.
@@ -373,7 +373,7 @@ public class HashedWheelTimer implements Timer {
         }
 
         public boolean isExpired() {
-            return cancelled || System.nanoTime() > deadline;
+            return cancelled || System.currentTimeMillis() > deadline;
         }
 
         public void expire() {
@@ -392,7 +392,7 @@ public class HashedWheelTimer implements Timer {
 
         @Override
         public String toString() {
-            long currentTime = System.nanoTime();
+            long currentTime = System.currentTimeMillis();
             long remaining = deadline - currentTime;
 
             StringBuilder buf = new StringBuilder(192);