Add files via upload

Chris2018998 · Oct 22, 2023 · 613db2b · 613db2b
1 parent ff7be47
commit 613db2b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 28 deletions.
diff --git a/src/main/java/org/stone/beetp/pool/JoinTaskHandle.java b/src/main/java/org/stone/beetp/pool/JoinTaskHandle.java
@@ -58,15 +58,6 @@ private JoinTaskHandle(BeeTask task, JoinTaskHandle parent, int brotherSize, Ato
         this.completedCount = completedCount;
     }
 
-    private static void cancelSubTasks(JoinTaskHandle[] subTaskHandles) {
-        new Thread() {
-            public void run() {
-                for (JoinTaskHandle childHandle : subTaskHandles)
-                    childHandle.cancel(true);
-            }
-        }.start();
-    }
-
     //***************************************************************************************************************//
     //                                  3: task cancel(1)                                                            //
     //***************************************************************************************************************//
@@ -75,7 +66,7 @@ public boolean cancel(final boolean mayInterruptIfRunning) {
 
         if (subTaskHandles != null) {
             if (this.isRoot) {
-                cancelSubTasks(subTaskHandles);
+                new AsynJoinCancelThread(root.subTaskHandles, mayInterruptIfRunning).start();
             } else {
                 for (JoinTaskHandle childHandle : subTaskHandles)
                     childHandle.cancel(mayInterruptIfRunning);
@@ -153,7 +144,22 @@ private void handleSubTaskException(Object result) {
             pool.getTaskRunningCount().decrementAndGet();
             pool.getTaskCompletedCount().incrementAndGet();
 
-            cancelSubTasks(root.subTaskHandles);
+            new AsynJoinCancelThread(root.subTaskHandles, true).start();
+        }
+    }
+
+    private static class AsynJoinCancelThread extends Thread {
+        private boolean mayInterruptIfRunning;
+        private JoinTaskHandle[] subTaskHandles;
+
+        AsynJoinCancelThread(JoinTaskHandle[] subTaskHandles, boolean mayInterruptIfRunning) {
+            this.subTaskHandles = subTaskHandles;
+            this.mayInterruptIfRunning = mayInterruptIfRunning;
+        }
+
+        public void run() {
+            for (JoinTaskHandle childHandle : subTaskHandles)
+                childHandle.cancel(mayInterruptIfRunning);
         }
     }
 }
diff --git a/src/main/java/org/stone/beetp/pool/TreeTaskHandle.java b/src/main/java/org/stone/beetp/pool/TreeTaskHandle.java
@@ -58,15 +58,6 @@ private TreeTaskHandle(BeeTreeTask task, TreeTaskHandle parent, int brotherSize,
         this.completedCount = completedCount;
     }
 
-    private static void cancelTreeSubTasks(TreeTaskHandle[] subTaskHandles) {
-        new Thread() {
-            public void run() {
-                for (TreeTaskHandle childHandle : subTaskHandles)
-                    childHandle.cancel(true);
-            }
-        }.start();
-    }
-
     BeeTreeTask getTreeTask() {
         return task;
     }
@@ -79,12 +70,7 @@ public boolean cancel(final boolean mayInterruptIfRunning) {
 
         if (subTaskHandles != null) {
             if (this.isRoot) {
-                new Thread() {//async to cancel children
-                    public void run() {
-                        for (TreeTaskHandle childHandle : subTaskHandles)
-                            childHandle.cancel(mayInterruptIfRunning);
-                    }
-                }.start();
+                new AsynTreeCancelThread(subTaskHandles, mayInterruptIfRunning).start();
             } else {
                 for (TreeTaskHandle childHandle : subTaskHandles)
                     childHandle.cancel(mayInterruptIfRunning);
@@ -153,7 +139,6 @@ void afterSetResult(final int state, final Object result) {
                             this.handleTreeSubTaskException(new TaskExecutionException(e));
                         }
                     }
-
                     break;
                 }
             } while (true);
@@ -166,7 +151,23 @@ private void handleTreeSubTaskException(Object result) {
             pool.getTaskHoldingCount().decrementAndGet();
             pool.getTaskRunningCount().decrementAndGet();
             pool.getTaskCompletedCount().incrementAndGet();
-            cancelTreeSubTasks(root.subTaskHandles);
+
+            new AsynTreeCancelThread(root.subTaskHandles, true).start();
+        }
+    }
+
+    private static class AsynTreeCancelThread extends Thread {
+        private boolean mayInterruptIfRunning;
+        private TreeTaskHandle[] subTaskHandles;
+
+        AsynTreeCancelThread(TreeTaskHandle[] subTaskHandles, boolean mayInterruptIfRunning) {
+            this.subTaskHandles = subTaskHandles;
+            this.mayInterruptIfRunning = mayInterruptIfRunning;
+        }
+
+        public void run() {
+            for (TreeTaskHandle childHandle : subTaskHandles)
+                childHandle.cancel(mayInterruptIfRunning);
         }
     }
 }