Merge pull request koush#488 from FiftyTwoDegreesNorth/issue-487

koush · web-flow · commit 75c4bbed9039 · 2016-10-05T00:16:53.000-07:00
koush#487 Separate worker for DNS resolve
diff --git a/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java b/AndroidAsync/src/com/koushikdutta/async/AsyncServer.java
@@ -129,6 +129,7 @@ public void removeAllCallbacks(Object scheduled) {
         }
     }
 
+    private static ExecutorService synchronousWorkers = newSynchronousWorkers("AsyncServer-worker-");
     private static void wakeup(final SelectorWrapper selector) {
         synchronousWorkers.execute(new Runnable() {
             @Override
@@ -418,8 +419,8 @@ public Cancellable connectSocket(final String host, final int port, final Connec
         return connectSocket(InetSocketAddress.createUnresolved(host, port), callback);
     }
 
-    private static ExecutorService newSynchronousWorkers() {
-        ThreadFactory tf = new NamedThreadFactory("AsyncServer-worker-");
+    private static ExecutorService newSynchronousWorkers(String prefix) {
+        ThreadFactory tf = new NamedThreadFactory(prefix);
         ThreadPoolExecutor tpe = new ThreadPoolExecutor(1, 4, 10L,
             TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), tf);
         return tpe;
@@ -438,10 +439,10 @@ public int compare(InetAddress lhs, InetAddress rhs) {
         }
     };
 
-    private static ExecutorService synchronousWorkers = newSynchronousWorkers();
+    private static ExecutorService synchronousResolverWorkers = newSynchronousWorkers("AsyncServer-resolver-");
     public Future<InetAddress[]> getAllByName(final String host) {
         final SimpleFuture<InetAddress[]> ret = new SimpleFuture<InetAddress[]>();
-        synchronousWorkers.execute(new Runnable() {
+        synchronousResolverWorkers.execute(new Runnable() {
             @Override
             public void run() {
                 try {
diff --git a/AndroidAsyncSample/build.gradle b/AndroidAsyncSample/build.gradle
@@ -19,6 +19,6 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    buildToolsVersion "24.0.2"
 }
 
diff --git a/AndroidAsyncStetho/build.gradle b/AndroidAsyncStetho/build.gradle
@@ -25,7 +25,7 @@ android {
     }
 
     compileSdkVersion 24
-    buildToolsVersion '24.0.0'
+    buildToolsVersion '24.0.2'
 }
 
 // upload to maven task

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ android {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`compileSdkVersion 24`
`22`		`- buildToolsVersion "24.0.0"`
	`22`	`+ buildToolsVersion "24.0.2"`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ android {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`compileSdkVersion 24`
`28`		`- buildToolsVersion '24.0.0'`
	`28`	`+ buildToolsVersion '24.0.2'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// upload to maven task`