更新子线程退出逻辑

u1s1jth · Apr 1, 2022 · 4938245 · 4938245
1 parent 6f9ffcd
commit 4938245
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/thread/Producer.java b/src/thread/Producer.java
@@ -51,10 +51,19 @@ public void stopThread() {
 	public void run() {
 		while(true){
 			try {
-				if (domainQueue.isEmpty() || stopflag) {
-					//stdout.println(threadNo+" Producer exited");
+				if (domainQueue.isEmpty() ) {
+					stdout.println(getName()+" exited. due to domainQueue is empty");
 					break;
 				}
+				if (stopflag){
+					stdout.println(getName()+" exited. due to stop flag is true");
+					break;
+				}
+				if (Thread.interrupted()){
+					stdout.println(getName()+" exited. due to thread interrupt signal received");
+					break;
+				}
+
 				String host = domainQueue.take();
 				int leftTaskNum = domainQueue.size();
 

diff --git a/src/thread/ThreadGetTitleWithForceStop.java b/src/thread/ThreadGetTitleWithForceStop.java
@@ -54,17 +54,16 @@ public void run(){
 			//https://www.cnblogs.com/zheaven/p/12054044.html
 		} catch (InterruptedException e) {
 			stdout.println("force stop received");
+			for (Producer p:plist) {
+				p.interrupt();//由于当前主线程退出，并非是JVM退出，子线程还会继续运行，必须主动中断子线程才可以。
+			}
 			e.printStackTrace();
 		}
 
 		stdout.println("all producer threads finished");
 		AllProductorFinished = true;
 	}
 
-	boolean isAllProductorFinished(){
-		return AllProductorFinished;
-	}
-
 	@Deprecated
 	public void stopThreads() {
 		for (Producer p:plist) {