本地调整

leopard3699 · leopard3699 · commit 28bba38f9bcf · 2022-03-27T19:40:22.000+08:00
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/ThreadA.java b/03concurrency/0301/src/main/java/java0/conc0301/ThreadA.java
@@ -9,6 +9,6 @@ public void run() {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        System.out.println("这是线程A");
+        System.out.println("这是线程A:"+Thread.currentThread().getName());
     }
 }
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/ThreadB.java b/03concurrency/0301/src/main/java/java0/conc0301/ThreadB.java
@@ -5,7 +5,7 @@ public class ThreadB implements Runnable {
     @Override
     public void run() {
         try {
-            Thread.sleep(500);
+            Thread.sleep(5000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/ThreadC.java b/03concurrency/0301/src/main/java/java0/conc0301/ThreadC.java
@@ -7,7 +7,7 @@ public class ThreadC implements Callable<String> {
     @Override
     public String call() throws Exception {
         Thread.sleep(500);
-        System.out.println("这是线程C");
+        System.out.println("这是线程C:"+Thread.currentThread().getName());
         return "线程C";
     }
 
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/ThreadMain.java b/03concurrency/0301/src/main/java/java0/conc0301/ThreadMain.java
@@ -12,6 +12,7 @@ public static void main(String[] args) {
         System.out.println("这是主线程：");
 
         ThreadB threadB = new ThreadB();
+//        threadB.run();
         new Thread(threadB).start();
         System.out.println("这是主线程：");
 
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/ThreadMain2.java b/03concurrency/0301/src/main/java/java0/conc0301/ThreadMain2.java
@@ -10,7 +10,7 @@ public static void main(String[] args) {
         }
 
         try {
-            Thread.sleep(10000);
+            Thread.sleep(100);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -26,6 +26,7 @@ public static void main(String[] args) {
         System.out.println("返回该线程所属的线程组：" + threadMain.getThreadGroup());
         System.out.println("测试线程是否为守护线程：" + threadMain.isDaemon());
 
+        System.out.println(Thread.getAllStackTraces());
 
 //        try {
 //            Thread.sleep(10000);
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/op/Join.java b/03concurrency/0301/src/main/java/java0/conc0301/op/Join.java
@@ -14,8 +14,8 @@ public static void main(String[] args) {
             for (int i = 0; i < 100; i++) {
                 if (i == 20) {
                     try {
-                        oo.wait(0);
-                        //thread1.join();
+//                        oo.wait(0); //释放oo锁，跳出循环
+                        thread1.join();//不会释放oo锁，会停在这
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/op/WaitAndNotify.java b/03concurrency/0301/src/main/java/java0/conc0301/op/WaitAndNotify.java
@@ -42,7 +42,7 @@ class MethodClass {
     
     public synchronized void product() throws InterruptedException {
         while (true) {
-            System.out.println(Thread.currentThread().getName() + ":::run:::" + productCount);
+            System.out.println(Thread.currentThread().getName() + ":::product:::" + productCount);
             Thread.sleep(10);
             if (productCount >= MAX_COUNT) {
                 System.out.println("货舱已满,,.不必再生产");
@@ -53,12 +53,13 @@ public synchronized void product() throws InterruptedException {
             }
             
             notifyAll();
+
         }
     }
     
     public synchronized void customer() throws InterruptedException {
         while (true) {
-            System.out.println(Thread.currentThread().getName() + ":::run:::" + productCount);
+            System.out.println(Thread.currentThread().getName() + ":::consumer:::" + productCount);
             Thread.sleep(10);
             if (productCount <= 0) {
                 System.out.println("货舱已无货...无法消费");
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java b/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java
@@ -1,5 +1,9 @@
 package java0.conc0301.sync;
 
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+
 public class Counter {
     
     private int sum = 0;
diff --git a/03concurrency/0301/src/main/java/java0/conc0302/lock/LockCounter.java b/03concurrency/0301/src/main/java/java0/conc0302/lock/LockCounter.java
@@ -0,0 +1,4 @@
+package java0.conc0302.lock;
+
+public class LockCounter {
+}
diff --git a/03concurrency/0301/src/main/java/java0/conc0303/future/CompletableFutureDemo.java b/03concurrency/0301/src/main/java/java0/conc0303/future/CompletableFutureDemo.java
@@ -1,11 +1,14 @@
 package java0.conc0303.future;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Vector;
 import java.util.concurrent.CompletableFuture;
 
 public class CompletableFutureDemo {
     
     public static void main(String[] args){
-        
+
         // 1.变换结果
         System.out.println("=====>1.变换结果");
         String result1 = CompletableFuture.supplyAsync(()->{return "Hello ";}).thenApplyAsync(v -> v + "world").join();

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public void run() {`
`9`	`9`	`} catch (InterruptedException e) {`
`10`	`10`	`e.printStackTrace();`
`11`	`11`	`}`
`12`		`- System.out.println("这是线程A");`
	`12`	`+ System.out.println("这是线程A:"+Thread.currentThread().getName());`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public class ThreadB implements Runnable {`
`5`	`5`	`@Override`
`6`	`6`	`public void run() {`
`7`	`7`	`try {`
`8`		`- Thread.sleep(500);`
	`8`	`+ Thread.sleep(5000);`
`9`	`9`	`} catch (InterruptedException e) {`
`10`	`10`	`e.printStackTrace();`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class ThreadC implements Callable<String> {`
`7`	`7`	`@Override`
`8`	`8`	`public String call() throws Exception {`
`9`	`9`	`Thread.sleep(500);`
`10`		`- System.out.println("这是线程C");`
	`10`	`+ System.out.println("这是线程C:"+Thread.currentThread().getName());`
`11`	`11`	`return "线程C";`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public static void main(String[] args) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`try {`
`13`		`- Thread.sleep(10000);`
	`13`	`+ Thread.sleep(100);`
`14`	`14`	`} catch (InterruptedException e) {`
`15`	`15`	`e.printStackTrace();`
`16`	`16`	`}`
`@@ -26,6 +26,7 @@ public static void main(String[] args) {`
`26`	`26`	`System.out.println("返回该线程所属的线程组：" + threadMain.getThreadGroup());`
`27`	`27`	`System.out.println("测试线程是否为守护线程：" + threadMain.isDaemon());`
`28`	`28`
	`29`	`+ System.out.println(Thread.getAllStackTraces());`
`29`	`30`
`30`	`31`	`// try {`
`31`	`32`	`// Thread.sleep(10000);`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package java0.conc0302.lock;
++
 +public class LockCounter {
 +}