# HG changeset patch # User robm # Date 1382110115 -3600 # Node ID 545dfa5b947ea2ec9228b5fb770b8e89144dcd3e # Parent 56310f56feac1b7b181ec646783a99ee50c519c1 8024660: TEST_BUG: java/lang/ProcessBuilder/*IOHandle.java leaving hotspot.log open in fastdebug builds Reviewed-by: alanb Contributed-by: pavel.punegov@oracle.com diff -r 56310f56feac -r 545dfa5b947e jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java --- a/jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java Fri Oct 18 16:01:26 2013 +0100 +++ b/jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java Fri Oct 18 16:28:35 2013 +0100 @@ -35,21 +35,22 @@ public class InheritIOEHandle { private static enum APP { - B, C; + A, B, C; } - private static File stopC = new File(".\\StopC.txt"); + + private static File stopC = new File("StopC.txt"); private static String SIGNAL = "After call child process"; private static String JAVA_EXE = System.getProperty("java.home") - + File.separator + "bin" - + File.separator + "java"; + + File.separator + "bin" + + File.separator + "java"; private static String[] getCommandArray(String processName) { String[] cmdArray = { - JAVA_EXE, - "-cp", - System.getProperty("java.class.path"), - InheritIOEHandle.class.getName(), - processName + JAVA_EXE, + "-cp", + System.getProperty("java.class.path"), + InheritIOEHandle.class.getName(), + processName }; return cmdArray; } @@ -59,19 +60,18 @@ return; } - if (args.length > 0) { - APP app = APP.valueOf(args[0]); - switch (app) { + APP app = (args.length > 0) ? APP.valueOf(args[0]) : APP.A; + switch (app) { + case A: + performA(); + break; case B: performB(); break; case C: performC(); break; - } - return; } - performA(); } private static void performA() { @@ -87,25 +87,40 @@ process.getOutputStream().close(); process.getErrorStream().close(); - try (BufferedReader in = new BufferedReader( new InputStreamReader( - process.getInputStream(), "utf-8"))) + boolean isSignalReceived = false; + try (BufferedReader in = new BufferedReader(new InputStreamReader( + process.getInputStream(), "utf-8"))) { String result; while ((result = in.readLine()) != null) { - if (!SIGNAL.equals(result)) { - throw new Error("Catastrophe in process B! Bad output."); + if (SIGNAL.equals(result)) { + isSignalReceived = true; + break; + } else { + throw new RuntimeException("Catastrophe in process B! Bad output."); } } + + } + if (!isSignalReceived) { + throw new RuntimeException("Signal from B was not received"); } // If JDK-7147084 is not fixed that point is unreachable. - + System.out.println("Received signal from B, creating file StopC"); // write signal file - stopC.createNewFile(); + boolean isFileStopC = stopC.createNewFile(); + if (!isFileStopC) { + throw new RuntimeException("Signal file StopC.txt was not created. TEST or INFRA bug"); + } + + process.waitFor(); System.err.println("Read stream finished."); } catch (IOException ex) { - throw new Error("Catastrophe in process A!", ex); + throw new RuntimeException("Catastrophe in process A!", ex); + } catch (InterruptedException ex) { + throw new RuntimeException("A was interrupted while waiting for B", ex); } } @@ -121,27 +136,31 @@ process.getErrorStream().close(); System.out.println(SIGNAL); + process.waitFor(); // JDK-7147084 subject: // Process C inherits the [System.out] handle and // handle close in B does not finalize the streaming for A. // (handle reference count > 1). } catch (IOException ex) { - throw new Error("Catastrophe in process B!", ex); + throw new RuntimeException("Catastrophe in process B!", ex); + } catch (InterruptedException ex) { + throw new RuntimeException("B was interrupted while waiting for C", ex); } } private static void performC() { // If JDK-7147084 is not fixed the loop is 5min long. - for (int i = 0; i < 5*60; ++i) { + for (int i = 0; i < 5 * 60; ++i) { try { Thread.sleep(1000); - // check for sucess - if (stopC.exists()) - break; } catch (InterruptedException ex) { // that is ok. Longer sleep - better effect. } + // check for success + if (stopC.exists()) { + break; + } } } } diff -r 56310f56feac -r 545dfa5b947e jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java --- a/jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java Fri Oct 18 16:01:26 2013 +0100 +++ b/jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java Fri Oct 18 16:28:35 2013 +0100 @@ -37,21 +37,22 @@ public class SiblingIOEHandle { private static enum APP { - B, C; + A, B, C; } + private static File stopC = new File(".\\StopCs.txt"); private static String SIGNAL = "B child reported."; private static String JAVA_EXE = System.getProperty("java.home") - + File.separator + "bin" - + File.separator + "java"; + + File.separator + "bin" + + File.separator + "java"; private static String[] getCommandArray(String processName) { String[] cmdArray = { - JAVA_EXE, - "-cp", - System.getProperty("java.class.path"), - SiblingIOEHandle.class.getName(), - processName + JAVA_EXE, + "-cp", + System.getProperty("java.class.path"), + SiblingIOEHandle.class.getName(), + processName }; return cmdArray; } @@ -61,20 +62,19 @@ return; } - if (args.length > 0) { - APP app = APP.valueOf(args[0]); - switch (app) { + APP app = (args.length > 0) ? APP.valueOf(args[0]) : APP.A; + switch (app) { + case A: + performA(true); + performA(false); + break; case B: performB(); break; case C: performC(); break; - } - return; } - performA(true); - performA(false); } static boolean procClaunched = false; @@ -86,6 +86,7 @@ // that was long enough } } + private static boolean waitBarrier(CyclicBarrier barrier) { while (true) try { barrier.await(); @@ -98,6 +99,36 @@ } } + private static class ProcessC implements Runnable { + private CyclicBarrier barrier; + private Process processC; + + public ProcessC(CyclicBarrier barrier) { + this.barrier = barrier; + } + + @Override + public void run() { + try { + if (waitBarrier(barrier)) { + waitAbit(); + // Run process C next to B ASAP to make an attempt + // to capture the B-process IOE handles in C process. + ProcessBuilder builderC = new ProcessBuilder( + getCommandArray(APP.C.name())); + processC = builderC.start(); + procClaunched = true; + } + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + public void waitFor() throws InterruptedException { + processC.waitFor(); + } + } + private static void performA(boolean fileOut) { try { stopC.delete(); @@ -112,26 +143,13 @@ builderB.redirectErrorStream(true); final CyclicBarrier barrier = new CyclicBarrier(2); - Thread procCRunner = new Thread(new Runnable() { - @Override public void run() { - try { - if (waitBarrier(barrier)) { - waitAbit(); - // Run process C next to B ASAP to make an attempt - // to capture the B-process IOE handles in C process. - Runtime.getRuntime().exec(getCommandArray(APP.C.name())); - procClaunched = true; - } - } catch (IOException ex) { - ex.printStackTrace(); - } - } - }); + //Create process C in a new thread + ProcessC processC = new ProcessC(barrier); + Thread procCRunner = new Thread(processC); procCRunner.start(); - if (!waitBarrier(barrier)) { - throw new Error("Catastrophe in process A! Synchronization failed."); + throw new RuntimeException("Catastrophe in process A! Synchronization failed."); } // Run process B first. Process processB = builderB.start(); @@ -144,7 +162,7 @@ } if (!procClaunched) { - throw new Error("Catastrophe in process A! C was not launched."); + throw new RuntimeException("Catastrophe in process A! C was not launched."); } processB.getOutputStream().close(); @@ -154,25 +172,30 @@ try { processB.waitFor(); } catch (InterruptedException ex) { - throw new Error("Catastrophe in process B! B hung up."); + throw new RuntimeException("Catastrophe in process B! B hung up."); } System.err.println("Trying to delete [outB.txt]."); if (!outB.delete()) { - throw new Error("Greedy brother C deadlock! File share."); + throw new RuntimeException("Greedy brother C deadlock! File share."); } System.err.println("Succeeded in delete [outB.txt]."); } else { System.err.println("Read stream start."); - try (BufferedReader in = new BufferedReader( new InputStreamReader( - processB.getInputStream(), "utf-8"))) - { + boolean isSignalReceived = false; + try (BufferedReader in = new BufferedReader(new InputStreamReader( + processB.getInputStream(), "utf-8"))) { String result; while ((result = in.readLine()) != null) { - if (!SIGNAL.equals(result)) { - throw new Error("Catastrophe in process B! Bad output."); + if (SIGNAL.equals(result)) { + isSignalReceived = true; + } else { + throw new RuntimeException("Catastrophe in process B! Bad output."); } } } + if (!isSignalReceived) { + throw new RuntimeException("Signal from B was not received"); + } System.err.println("Read stream finished."); } // If JDK-6921885 is not fixed that point is unreachable. @@ -180,8 +203,11 @@ // write signal file to stop C process. stopC.createNewFile(); + processC.waitFor(); } catch (IOException ex) { - throw new Error("Catastrophe in process A!", ex); + throw new RuntimeException("Catastrophe in process A!", ex); + } catch (InterruptedException ex) { + throw new RuntimeException("Process A was interrupted while waiting for C", ex); } } @@ -191,7 +217,7 @@ private static void performC() { // If JDK-7147084 is not fixed the loop is 5min long. - for (int i = 0; i < 5*60; ++i) { + for (int i = 0; i < 5 * 60; ++i) { try { Thread.sleep(1000); // check for sucess