jdk/test/java/lang/ProcessBuilder/Basic.java

rev 11228 : 8054494: Remove sun.misc.Unsafe.monitorEnter, monitorExit and tryMonitorEnter
Reviewed-by: dholmes

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 24,34 ****
  /*
   * @test
   * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689
   *      5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
   *      6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
!  *      4947220 7018606 7034570 4244896 5049299 8003488
   * @summary Basic tests for Process and Environment Variable code
   * @run main/othervm/timeout=300 Basic
   * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
   * @author Martin Buchholz
   */
--- 24,34 ----
  /*
   * @test
   * @bug 4199068 4738465 4937983 4930681 4926230 4931433 4932663 4986689
   *      5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
   *      6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
!  *      4947220 7018606 7034570 4244896 5049299 8003488 8054494
   * @summary Basic tests for Process and Environment Variable code
   * @run main/othervm/timeout=300 Basic
   * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
   * @author Martin Buchholz
   */
*** 2057,2073 ****
  
                      while (useCountField.getInt(deferred) <= 0) {
                          Thread.yield();
                      }
                  } else if (s instanceof BufferedInputStream) {
!                     Field f = Unsafe.class.getDeclaredField("theUnsafe");
!                     f.setAccessible(true);
!                     Unsafe unsafe = (Unsafe)f.get(null);
! 
!                     while (unsafe.tryMonitorEnter(s)) {
!                         unsafe.monitorExit(s);
!                         Thread.sleep(1);
                      }
                  }
                  p.destroy();
                  thread.join();
              }
--- 2057,2071 ----
  
                      while (useCountField.getInt(deferred) <= 0) {
                          Thread.yield();
                      }
                  } else if (s instanceof BufferedInputStream) {
!                     // Wait until after the s.read occurs in "thread" by
!                     // checking when the input stream monitor is acquired
!                     // (BufferedInputStream.read is synchronized)
!                     while (!isLocked(s, 10)) {
!                         Thread.sleep(100);
                      }
                  }
                  p.destroy();
                  thread.join();
              }
*** 2563,2568 ****
--- 2561,2583 ----
          for (Fun f : fs)
              try { f.f(); fail("Expected " + k.getName() + " not thrown"); }
              catch (Throwable t) {
                  if (k.isAssignableFrom(t.getClass())) pass();
                  else unexpected(t);}}
+ 
+     static boolean isLocked(final Object monitor, final long millis) throws InterruptedException {
+         return new Thread() {
+             volatile boolean unlocked;
+ 
+             @Override
+             public void run() {
+                 synchronized (monitor) { unlocked = true; }
+             }
+ 
+             boolean isLocked() throws InterruptedException {
+                 start();
+                 join(millis);
+                 return !unlocked;
+             }
+         }.isLocked();
+     }
  }