Use currentTimeMillis for timeouts, close AsyncHttpClient#1162

Author: slandelle

client/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -13,7 +13,7 @@
  */
 package org.asynchttpclient.netty;
 
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import static org.asynchttpclient.util.MiscUtils.getCause;
 import static io.netty.util.internal.PlatformDependent.*;
 import io.netty.channel.Channel;
@@ -62,7 +62,7 @@ public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
     // FIXME see https://github.com/netty/netty/pull/4669
     private static final AtomicReferenceFieldUpdater<NettyResponseFuture, ExecutionException> EX_EX_UPDATER = newAtomicReferenceFieldUpdater(NettyResponseFuture.class, "exEx");
 
-    private final long start = millisTime();
+    private final long start = unpreciseMillisTime();
     private final ChannelPoolPartitioning connectionPoolPartitioning;
     private final ProxyServer proxyServer;
     private final int maxRetry;
@@ -85,7 +85,7 @@ public final class NettyResponseFuture<V> extends AbstractListenableFuture<V> {
     private volatile ExecutionException exEx;
 
     // volatile where we don't need CAS ops
-    private volatile long touch = millisTime();
+    private volatile long touch = unpreciseMillisTime();
     private volatile TimeoutsHolder timeoutsHolder;
     private volatile ChannelState channelState = ChannelState.NEW;
 
@@ -254,7 +254,7 @@ public final void abort(final Throwable t) {
 
     @Override
     public void touch() {
-        touch = millisTime();
+        touch = unpreciseMillisTime();
     }
 
     @Override

client/src/main/java/org/asynchttpclient/netty/channel/DefaultChannelPool.java

@@ -14,7 +14,7 @@
 package org.asynchttpclient.netty.channel;
 
 import static org.asynchttpclient.util.Assertions.assertNotNull;
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelId;
 import io.netty.util.Timeout;
@@ -190,7 +190,7 @@ public void run(Timeout timeout) throws Exception {
                     LOGGER.debug("Entry count for : {} : {}", key, partitions.get(key).size());
                 }
 
-            long start = millisTime();
+            long start = unpreciseMillisTime();
             int closedCount = 0;
             int totalCount = 0;
 
@@ -215,7 +215,7 @@ public void run(Timeout timeout) throws Exception {
             }
 
             if (LOGGER.isDebugEnabled()) {
-                long duration = millisTime() - start;
+                long duration = unpreciseMillisTime() - start;
                 LOGGER.debug("Closed {} connections out of {} in {}ms", closedCount, totalCount, duration);
             }
 
@@ -230,7 +230,7 @@ public boolean offer(Channel channel, Object partitionKey) {
         if (isClosed.get())
             return false;
 
-        long now = millisTime();
+        long now = unpreciseMillisTime();
 
         if (isTtlExpired(channel, now))
             return false;

client/src/main/java/org/asynchttpclient/netty/timeout/ReadTimeoutTimerTask.java

@@ -13,7 +13,7 @@
  */
 package org.asynchttpclient.netty.timeout;
 
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import io.netty.util.Timeout;
 
 import org.asynchttpclient.netty.NettyResponseFuture;
@@ -42,7 +42,7 @@ public void run(Timeout timeout) throws Exception {
             return;
         }
 
-        long now = millisTime();
+        long now = unpreciseMillisTime();
 
         long currentReadTimeoutInstant = readTimeout + nettyResponseFuture.getLastTouch();
         long durationBeforeCurrentReadTimeout = currentReadTimeoutInstant - now;

client/src/main/java/org/asynchttpclient/netty/timeout/RequestTimeoutTimerTask.java

@@ -13,7 +13,7 @@
  */
 package org.asynchttpclient.netty.timeout;
 
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import io.netty.util.Timeout;
 
 import org.asynchttpclient.netty.NettyResponseFuture;
@@ -44,7 +44,7 @@ public void run(Timeout timeout) throws Exception {
             return;
 
         String message = "Request timeout to " + timeoutsHolder.remoteAddress() + " after " + requestTimeout + "ms";
-        long age = millisTime() - nettyResponseFuture.getStart();
+        long age = unpreciseMillisTime() - nettyResponseFuture.getStart();
         expire(message, age);
     }
 }

client/src/main/java/org/asynchttpclient/netty/timeout/TimeoutsHolder.java

@@ -13,7 +13,7 @@
  */
 package org.asynchttpclient.netty.timeout;
 
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
@@ -52,7 +52,7 @@ public TimeoutsHolder(Timer nettyTimer, NettyResponseFuture<?> nettyResponseFutu
         }
 
         if (requestTimeoutInMs != -1) {
-            requestTimeoutMillisTime = millisTime() + requestTimeoutInMs;
+            requestTimeoutMillisTime = unpreciseMillisTime() + requestTimeoutInMs;
             requestTimeout = newTimeout(new RequestTimeoutTimerTask(nettyResponseFuture, requestSender, this, requestTimeoutInMs), requestTimeoutInMs);
         } else {
             requestTimeoutMillisTime = -1L;
@@ -71,7 +71,7 @@ public void startReadTimeout() {
     }
 
     void startReadTimeout(ReadTimeoutTimerTask task) {
-        if (requestTimeout == null || (!requestTimeout.isExpired() && readTimeoutValue > (requestTimeoutMillisTime - millisTime()))) {
+        if (requestTimeout == null || (!requestTimeout.isExpired() && readTimeoutValue > (requestTimeoutMillisTime - unpreciseMillisTime()))) {
             // only schedule a new readTimeout if the requestTimeout doesn't happen first
             if (task == null) {
                 // first call triggered from outside (else is read timeout is re-scheduling itself)

client/src/main/java/org/asynchttpclient/util/DateUtils.java

@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2010-2012 Sonatype, Inc. All rights reserved.
+ * Copyright (c) 2015 AsyncHttpClient Project. All rights reserved.
  *
  * This program is licensed to you under the Apache License Version 2.0,
  * and you may not use this file except in compliance with the Apache License Version 2.0.
- * You may obtain a copy of the Apache License Version 2.0 at http://www.apache.org/licenses/LICENSE-2.0.
+ * You may obtain a copy of the Apache License Version 2.0 at
+ *     http://www.apache.org/licenses/LICENSE-2.0.
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the Apache License Version 2.0 is distributed on an
@@ -17,7 +18,7 @@ public final class DateUtils {
     private DateUtils() {
     }
 
-    public static long millisTime() {
-        return System.nanoTime() / 1000000;
+    public static long unpreciseMillisTime() {
+        return System.currentTimeMillis();
     }
 }

client/src/test/java/org/asynchttpclient/BasicHttpTest.java

@@ -19,7 +19,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.asynchttpclient.Dsl.*;
 import static org.asynchttpclient.test.TestUtils.*;
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import static org.testng.Assert.*;
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.HttpHeaders;
@@ -661,11 +661,11 @@ public void configRequestTimeoutHappensInDueTime() throws Throwable {
                 h.add("X-Delay", 2_000);
 
                 server.enqueueEcho();
-                long start = millisTime();
+                long start = unpreciseMillisTime();
                 try {
                     client.prepareGet(getTargetUrl()).setHeaders(h).setUrl(getTargetUrl()).execute().get();
                 } catch (Throwable ex) {
-                    final long elapsedTime = millisTime() - start;
+                    final long elapsedTime = unpreciseMillisTime() - start;
                     assertTrue(elapsedTime >= 1_000 && elapsedTime <= 1_500);
                     throw ex.getCause();
                 }

client/src/test/java/org/asynchttpclient/PerRequestTimeoutTest.java

@@ -16,7 +16,7 @@
 package org.asynchttpclient;
 
 import static org.asynchttpclient.Dsl.*;
-import static org.asynchttpclient.util.DateUtils.millisTime;
+import static org.asynchttpclient.util.DateUtils.unpreciseMillisTime;
 import static org.testng.Assert.*;
 
 import java.io.IOException;
@@ -149,13 +149,13 @@ public Response onCompleted(Response response) throws Exception {
 
                 @Override
                 public State onBodyPartReceived(HttpResponseBodyPart content) throws Exception {
-                    times[0] = millisTime();
+                    times[0] = unpreciseMillisTime();
                     return super.onBodyPartReceived(content);
                 }
 
                 @Override
                 public void onThrowable(Throwable t) {
-                    times[1] = millisTime();
+                    times[1] = unpreciseMillisTime();
                     super.onThrowable(t);
                 }
             });