[Wisp] Fix PassTokenTest

Summary: There is an unlocked time window between pass token and notify next, causing the test to occasionally fail. Test Plan: PassTokenTest Reviewed-by: D-D-H, joeylee97 Issue: dragonwell-project/dragonwell8#290
yuleil · Jan 27, 2022 · c2f47b9 · c2f47b9
1 parent 0bd1f67
commit c2f47b9
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/test/com/alibaba/wisp/monitor/PassTokenTest.java b/test/com/alibaba/wisp/monitor/PassTokenTest.java
@@ -45,6 +45,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.testlibrary.Asserts.fail;
 
 public class PassTokenTest {
     private final static boolean needCheckStealEnable = Boolean.getBoolean("checkStealEnable");
@@ -133,11 +134,13 @@ public void run() {
                                 cond.await();
                                 checkStealEnable(task);
                             } catch (InterruptedException e) {
-                                e.printStackTrace();
+                                fail(e.getMessage());
                             }
                         }
-                        if (++current % 10000 == 0) // pass the token
+                        if (++current % 10000 == 0) {// pass the token
                             System.out.println(SharedSecrets.getJavaLangAccess().currentThread0().getName() + "\t" + current);
+                        }
+                        cond.signalAll();
                     } finally {
                         lock.unlock();
                     }
@@ -148,23 +151,12 @@ public void run() {
                                 lock.wait();
                                 checkStealEnable(task);
                             } catch (InterruptedException e) {
-                                e.printStackTrace();
+                                fail(e.getMessage());
                             }
                         }
-                        if (++current % 10000 == 0) // pass the token
+                        if (++current % 10000 == 0) {// pass the token
                             System.out.println(SharedSecrets.getJavaLangAccess().currentThread0().getName() + "\t" + current);
-                    }
-                }
-
-                if (JUC) {
-                    lock.lock();
-                    try {
-                        cond.signalAll();
-                    } finally {
-                        lock.unlock();
-                    }
-                } else {
-                    synchronized (lock) {
+                        }
                         lock.notifyAll();
                     }
                 }