Java并发

heibaiying · heibaiying · commit 7a257140b75f · 2019-11-27T16:54:51.000+08:00
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/countDown/J2_CountDown.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/countDown/J2_CountDown.java
@@ -8,6 +8,7 @@
 public class J2_CountDown {
 
 	private static int number = 100;
+	// &#25351;&#23450;&#35745;&#25968;&#22120;&#30340;&#21021;&#22987;&#20540;
 	private static CountDownLatch latch = new CountDownLatch(number);
 	private static AtomicInteger integer = new AtomicInteger(0);
 
@@ -19,7 +20,7 @@ public void run() {
 				// &#20551;&#35774;&#36825;&#26159;&#19968;&#20010;&#32791;&#26102;&#30340;&#20219;&#21153;
 				Thread.sleep(3000);
 				integer.incrementAndGet();
-				// &#35745;&#25968;&#20943;&#19968;
+				// &#35745;&#25968;&#22120;&#20943;1
 				latch.countDown();
 			} catch (InterruptedException e) {
 				e.printStackTrace();
@@ -33,8 +34,8 @@ public static void main(String[] args) throws InterruptedException {
 		for (int i = 0; i < number; i++) {
 			executorService.submit(task);
 		}
+		// &#31561;&#24453;&#35745;&#25968;&#22120;&#20026;0&#26102;&#21796;&#37266;&#25152;&#26377;&#31561;&#24453;&#30340;&#32447;&#31243;
 		latch.await();
-		// &#20250;&#31561;&#24453;&#25152;&#26377;&#20219;&#21153;&#25191;&#34892;&#23436;&#25104;&#20877;&#36755;&#20986;
 		System.out.println("integer&#65306;" + integer);
 		executorService.shutdown();
 	}
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/semaphore/J1_Semaphore.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/semaphore/J1_Semaphore.java
@@ -4,6 +4,7 @@
 
 public class J1_Semaphore {
 
+	// &#38480;&#21046;&#24182;&#21457;&#35775;&#38382;&#30340;&#32447;&#31243;&#30340;&#25968;&#37327;&#20026;5
 	private static Semaphore semaphore = new Semaphore(5);
 
 	static class IncreaseTask implements Runnable {
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/stop/ThreadStop.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/stop/ThreadStop.java
@@ -0,0 +1,26 @@
+package com.heibaiying.stop;
+
+/**
+ * &#32447;&#31243;&#32456;&#27490;
+ */
+public class ThreadStop {
+
+	private static volatile boolean stopFlag = true;
+
+	public static void main(String[] args) throws InterruptedException {
+		Thread thread = new Thread(() -> {
+			while (stopFlag) {
+				try {
+					Thread.sleep(100);
+					System.out.println("&#25345;&#32493;&#36755;&#20986;");
+				} catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+		});
+		thread.start();
+		Thread.sleep(3 * 1000);
+		stopFlag = false;
+		System.out.println("&#32447;&#31243;&#32456;&#27490;");
+	}
+}
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/threadPool/J1_ThreadPool.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/threadPool/J1_ThreadPool.java
@@ -11,15 +11,22 @@ public class J1_ThreadPool {
 	static class Task implements Runnable {
 		@Override
 		public void run() {
-			System.out.println(Thread.currentThread().getName() + "&#27491;&#22312;&#25191;&#34892;");
+			try {
+				Thread.sleep(100);
+				System.out.println(Thread.currentThread().getName() + "&#27491;&#22312;&#25191;&#34892;");
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
 		}
 	}
 
 	public static void main(String[] args) {
 		ExecutorService executorService = Executors.newFixedThreadPool(10);
 		for (int i = 0; i < 100; i++) {
+			// &#25552;&#20132;&#20219;&#21153;&#21040;&#32447;&#31243;&#27744;
 			executorService.submit(new Task());
 		}
+		// &#20851;&#38381;&#32447;&#31243;&#27744;&#65292;&#27492;&#26102;&#19981;&#20877;&#25509;&#21463;&#26032;&#20219;&#21153;&#65292;&#20294;&#20173;&#20250;&#31561;&#24453;&#21407;&#26377;&#30340;&#20219;&#21153;&#25191;&#34892;&#23436;&#25104;&#65292;&#22914;&#26524;&#24819;&#35201;&#31435;&#21363;&#20851;&#38381;&#65292;&#21017;&#21487;&#20197;&#20351;&#29992;shutdownNow()
 		executorService.shutdown();
 	}
 }
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/threadPool/J2_ScheduledTask.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/threadPool/J2_ScheduledTask.java
@@ -33,12 +33,13 @@ public void run() {
 	}
 
 	public static void main(String[] args) {
+		// &#20026;&#36991;&#20813;&#30456;&#20114;&#38388;&#30340;&#24433;&#21709;&#65292;&#20197;&#19979;&#21508;&#31181;&#22330;&#26223;&#26368;&#22909;&#20998;&#21035;&#27979;&#35797;&#65306;
 		ScheduledExecutorService pool = Executors.newScheduledThreadPool(10);
 		// &#21482;&#25191;&#34892;&#19968;&#27425;
 		pool.schedule(new Task("schedule"), 2, TimeUnit.SECONDS);
-		// &#25351;&#23450;2&#31186;&#20026;&#22266;&#23450;&#21608;&#26399;&#25191;&#34892;&#65292;&#22914;&#26524;&#39033;&#30446;&#25191;&#34892;&#32791;&#26102;5&#31186;&#65292;&#21017;&#39033;&#30446;&#32467;&#26463;&#21518;&#31435;&#39532;&#25191;&#34892;&#19979;&#19968;&#27425;&#20219;&#21153;&#65292;&#25152;&#20197;&#36755;&#20986;&#30340;&#26102;&#38388;&#38388;&#38548;&#20026;5&#31186;
+		// &#25351;&#23450;2&#31186;&#20026;&#22266;&#23450;&#21608;&#26399;&#25191;&#34892;&#65292;&#22240;&#20026;&#39033;&#30446;&#25191;&#34892;&#32791;&#26102;5&#31186;&#65292;&#27492;&#26102;&#39033;&#30446;&#32467;&#26463;&#20250;&#31435;&#39532;&#25191;&#34892;&#19979;&#19968;&#27425;&#20219;&#21153;&#65292;&#25152;&#20197;&#36755;&#20986;&#30340;&#26102;&#38388;&#38388;&#38548;&#20026;5&#31186;
 		pool.scheduleAtFixedRate(new Task("FixedRate"), 0, 2, TimeUnit.SECONDS);
-		// &#24635;&#26159;&#22312;&#19978;&#19968;&#27425;&#39033;&#30446;&#32467;&#26463;&#21518;&#38388;&#38548;&#25351;&#23450;&#21608;&#26399;&#25191;&#34892;&#65292;&#25152;&#20197;&#39033;&#30446;&#32791;&#26102;5&#31186;&#65292;&#36824;&#38656;&#35201;&#38388;&#38548;2&#31186;&#25191;&#34892;&#65292;&#25152;&#20197;&#36755;&#20986;&#30340;&#26102;&#38388;&#38388;&#38548;&#20026;7&#31186;
+		// &#24635;&#26159;&#22312;&#19978;&#19968;&#27425;&#39033;&#30446;&#32467;&#26463;&#21518;&#38388;&#38548;&#25351;&#23450;&#21608;&#26399;&#25191;&#34892;&#65292;&#22240;&#20026;&#39033;&#30446;&#32791;&#26102;5&#31186;&#65292;&#36824;&#38656;&#35201;&#38388;&#38548;2&#31186;&#25191;&#34892;&#65292;&#25152;&#20197;&#36755;&#20986;&#30340;&#26102;&#38388;&#38388;&#38548;&#20026;7&#31186;
 		pool.scheduleWithFixedDelay(new Task("WithFixedDelay"), 0, 2, TimeUnit.SECONDS);
 		// pool.shutdown();
 	}
diff --git a/code/Java/java-concurrency/src/main/java/com/heibaiying/yieldAndJoin/J1_Normal.java b/code/Java/java-concurrency/src/main/java/com/heibaiying/yieldAndJoin/J1_Normal.java
@@ -7,7 +7,7 @@ public class J1_Normal {
 
 	private static int j = 0;
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args)  {
 		Thread thread = new Thread(() -> {
 			for (int i = 0; i < 100000; i++) {
 				j++;
diff --git a/notes/Java_&#24182;&#21457;.md b/notes/Java_&#24182;&#21457;.md
diff --git a/notes/&#12298;&#23454;&#25112;Java&#39640;&#24182;&#21457;&#31243;&#24207;&#35774;&#35745;&#12299;&#35835;&#20070;&#31508;&#35760;.md b/notes/&#12298;&#23454;&#25112;Java&#39640;&#24182;&#21457;&#31243;&#24207;&#35774;&#35745;&#12299;&#35835;&#20070;&#31508;&#35760;.md

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,22 @@ public class J1_ThreadPool {`
`11`	`11`	`static class Task implements Runnable {`
`12`	`12`	`@Override`
`13`	`13`	`public void run() {`
`14`		`- System.out.println(Thread.currentThread().getName() + "正在执行");`
	`14`	`+ try {`
	`15`	`+ Thread.sleep(100);`
	`16`	`+ System.out.println(Thread.currentThread().getName() + "正在执行");`
	`17`	`+ } catch (InterruptedException e) {`
	`18`	`+ e.printStackTrace();`
	`19`	`+ }`
`15`	`20`	`}`
`16`	`21`	`}`
`17`	`22`
`18`	`23`	`public static void main(String[] args) {`
`19`	`24`	`ExecutorService executorService = Executors.newFixedThreadPool(10);`
`20`	`25`	`for (int i = 0; i < 100; i++) {`
	`26`	`+ // 提交任务到线程池`
`21`	`27`	`executorService.submit(new Task());`
`22`	`28`	`}`
	`29`	`+ // 关闭线程池，此时不再接受新任务，但仍会等待原有的任务执行完成，如果想要立即关闭，则可以使用shutdownNow()`
`23`	`30`	`executorService.shutdown();`
`24`	`31`	`}`
`25`	`32`	`}`
-Original file line number
+Diff line change
+	}
 	public static void main(String[] args) {
 +		// 为避免相互间的影响，以下各种场景最好分别测试：
 		ScheduledExecutorService pool = Executors.newScheduledThreadPool(10);
 		// 只执行一次
 		pool.schedule(new Task("schedule"), 2, TimeUnit.SECONDS);
 -		// 指定2秒为固定周期执行，如果项目执行耗时5秒，则项目结束后立马执行下一次任务，所以输出的时间间隔为5秒
 +		// 指定2秒为固定周期执行，因为项目执行耗时5秒，此时项目结束会立马执行下一次任务，所以输出的时间间隔为5秒
 		pool.scheduleAtFixedRate(new Task("FixedRate"), 0, 2, TimeUnit.SECONDS);
 -		// 总是在上一次项目结束后间隔指定周期执行，所以项目耗时5秒，还需要间隔2秒执行，所以输出的时间间隔为7秒
 +		// 总是在上一次项目结束后间隔指定周期执行，因为项目耗时5秒，还需要间隔2秒执行，所以输出的时间间隔为7秒
 		pool.scheduleWithFixedDelay(new Task("WithFixedDelay"), 0, 2, TimeUnit.SECONDS);
 		// pool.shutdown();
+	}