Fixed PoolSearch shutting down method

rdadkins · May 14, 2016 · 5274cd4 · 5274cd4
1 parent 73720b6
commit 5274cd4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/VanityGenerator-core/src/main/java/co/bitsquared/vanitygenerator/core/search/PoolSearch.java b/VanityGenerator-core/src/main/java/co/bitsquared/vanitygenerator/core/search/PoolSearch.java
@@ -104,8 +104,8 @@ public void onQueryAdded(RegexQuery query) {
     private void searchAll() {
         ECKey key;
         RegexQuery query;
-        long localGen = 0;
-        while (!forceStop) {
+        long localGen;
+        while (!(forceStop || threadKilled())) {
             key = new ECKey();
             localGen = ++generated;
             if ((query = pool.matches(key, netParams)) != null) {
@@ -129,7 +129,7 @@ private void searchInOrder() {
         ECKey key;
         long localGen;
         isSearching = true;
-        while (isSearching) {
+        while (isSearching && !threadKilled()) {
             key = new ECKey();
             localGen = ++generated;
             if (query.matches(key, netParams)) {
@@ -162,6 +162,10 @@ private RegexQuery getNextQuery() {
         return query;
     }
 
+    private boolean threadKilled() {
+        return Thread.currentThread().isInterrupted();
+    }
+
     public void stop() {
         forceStop = true;
         isSearching = false;

diff --git a/examples/src/main/java/co/bitsquared/vanitygenerator/examples/SpeedTests.java b/examples/src/main/java/co/bitsquared/vanitygenerator/examples/SpeedTests.java
@@ -34,10 +34,7 @@ public void maxSpeed(int threads) {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        for (Runnable thread: service.shutdownNow()) {
-            PoolSearch search = (PoolSearch) thread;
-            search.stop();
-        }
+        service.shutdownNow();
         System.out.println("Max Speed: " + listener.maxSearchSpeed);
     }