update

kimmking · kimmking · commit b01f882e3099 · 2021-01-24T21:45:24.000+08:00
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/DaemonThread.java b/03concurrency/0301/src/main/java/java0/conc0301/DaemonThread.java
@@ -2,23 +2,22 @@
 
 public class DaemonThread {
     
-    public static void main(String[] args) {
-        Runnable task = new Runnable() {
-            @Override
-            public void run() {
+    public static void main(String[] args) throws InterruptedException {
+        Runnable task = () -> {
                 try {
-                    Thread.sleep(5000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
+                    Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
                 Thread t = Thread.currentThread();
                 System.out.println("当前线程:" + t.getName());
-            }
         };
         Thread thread = new Thread(task);
         thread.setName("test-thread-1");
-        thread.setDaemon(false);
+        thread.setDaemon(true);
         thread.start();
+
+        //Thread.sleep(2000);
     }
     
     
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/op/Join.java b/03concurrency/0301/src/main/java/java0/conc0301/op/Join.java
@@ -6,10 +6,10 @@ public static void main(String[] args) {
         Object oo = new Object();
     
         MyThread thread1 = new MyThread("thread1 -- ");
-        thread1.setOo(oo);
+        thread1.setOo(thread1);
         thread1.start();
         
-        synchronized (thread1) {
+        synchronized (thread1) {  // 这里用oo或thread1/this
             for (int i = 0; i < 100; i++) {
                 if (i == 20) {
                     try {
@@ -40,7 +40,7 @@ public MyThread(String name) {
     
     @Override
     public void run() {
-        synchronized (this) {
+        synchronized (this) { // 这里用oo或this，效果不同
             for (int i = 0; i < 100; i++) {
                 System.out.println(name + i);
             }
diff --git a/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java b/03concurrency/0301/src/main/java/java0/conc0301/sync/Counter.java
@@ -7,7 +7,7 @@ public class Counter {
     public static int B=10;
     
     private volatile int sum = 0;
-    public synchronized void incr() {
+    public void incr() {
         sum=sum+1;
     }
     public int getSum() {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class Counter {`
`7`	`7`	`public static int B=10;`
`8`	`8`
`9`	`9`	`private volatile int sum = 0;`
`10`		`- public synchronized void incr() {`
	`10`	`+ public void incr() {`
`11`	`11`	`sum=sum+1;`
`12`	`12`	`}`
`13`	`13`	`public int getSum() {`