author | rriggs |
Wed, 19 Nov 2014 21:22:22 -0500 | |
changeset 27732 | 31d7da6e79bf |
parent 25859 | 3317bb8137f4 |
permissions | -rw-r--r-- |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
1 |
/* |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
2 |
* Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved. |
2 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
5506 | 7 |
* published by the Free Software Foundation. Oracle designates this |
2 | 8 |
* particular file as subject to the "Classpath" exception as provided |
5506 | 9 |
* by Oracle in the LICENSE file that accompanied this code. |
2 | 10 |
* |
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
5506 | 21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
2 | 24 |
*/ |
25 |
||
26 |
package java.lang; |
|
27 |
||
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
28 |
import java.io.BufferedInputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
29 |
import java.io.BufferedOutputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
30 |
import java.io.ByteArrayInputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
31 |
import java.io.FileDescriptor; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
32 |
import java.io.FileInputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
33 |
import java.io.FileOutputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
34 |
import java.io.IOException; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
35 |
import java.io.InputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
36 |
import java.io.OutputStream; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
37 |
import java.util.Arrays; |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
38 |
import java.util.EnumSet; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
39 |
import java.util.Locale; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
40 |
import java.util.Set; |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
41 |
import java.util.concurrent.Executors; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
42 |
import java.util.concurrent.Executor; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
43 |
import java.util.concurrent.ThreadFactory; |
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
44 |
import java.util.concurrent.TimeUnit; |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
45 |
import java.security.AccessController; |
6516
8c52bb671f3e
6980747: Runtime.exec can fail due to SecurityException (lnx)
martin
parents:
5786
diff
changeset
|
46 |
import static java.security.AccessController.doPrivileged; |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
47 |
import java.security.PrivilegedAction; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
48 |
import java.security.PrivilegedActionException; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
49 |
import java.security.PrivilegedExceptionAction; |
2 | 50 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
51 |
/** |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
52 |
* java.lang.Process subclass in the UNIX environment. |
2 | 53 |
* |
54 |
* @author Mario Wolczko and Ross Knippel. |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
55 |
* @author Konstantin Kladko (ported to Linux and Bsd) |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
56 |
* @author Martin Buchholz |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
57 |
* @author Volker Simonis (ported to AIX) |
2 | 58 |
*/ |
59 |
final class UNIXProcess extends Process { |
|
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
60 |
private static final sun.misc.JavaIOFileDescriptorAccess fdAccess |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
61 |
= sun.misc.SharedSecrets.getJavaIOFileDescriptorAccess(); |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
62 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
63 |
private final int pid; |
2 | 64 |
private int exitcode; |
65 |
private boolean hasExited; |
|
66 |
||
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
67 |
private /* final */ OutputStream stdin; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
68 |
private /* final */ InputStream stdout; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
69 |
private /* final */ InputStream stderr; |
2 | 70 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
71 |
// only used on Solaris |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
72 |
private /* final */ DeferredCloseInputStream stdout_inner_stream; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
73 |
|
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
74 |
private static enum LaunchMechanism { |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
75 |
// order IS important! |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
76 |
FORK, |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
77 |
POSIX_SPAWN, |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
78 |
VFORK |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
79 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
80 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
81 |
private static enum Platform { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
82 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
83 |
LINUX(LaunchMechanism.VFORK, LaunchMechanism.FORK), |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
84 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
85 |
BSD(LaunchMechanism.POSIX_SPAWN, LaunchMechanism.FORK), |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
86 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
87 |
SOLARIS(LaunchMechanism.POSIX_SPAWN, LaunchMechanism.FORK), |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
88 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
89 |
AIX(LaunchMechanism.POSIX_SPAWN, LaunchMechanism.FORK); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
90 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
91 |
final LaunchMechanism defaultLaunchMechanism; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
92 |
final Set<LaunchMechanism> validLaunchMechanisms; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
93 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
94 |
Platform(LaunchMechanism ... launchMechanisms) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
95 |
this.defaultLaunchMechanism = launchMechanisms[0]; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
96 |
this.validLaunchMechanisms = |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
97 |
EnumSet.copyOf(Arrays.asList(launchMechanisms)); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
98 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
99 |
|
24626
87c5b99a6002
8043916: Fix fallthrough lint warnings in java/lang/UNIXProcess.java
darcy
parents:
24577
diff
changeset
|
100 |
@SuppressWarnings("fallthrough") |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
101 |
private String helperPath(String javahome, String osArch) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
102 |
switch (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
103 |
case SOLARIS: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
104 |
if (osArch.equals("x86")) { osArch = "i386"; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
105 |
else if (osArch.equals("x86_64")) { osArch = "amd64"; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
106 |
// fall through... |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
107 |
case LINUX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
108 |
case AIX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
109 |
return javahome + "/lib/" + osArch + "/jspawnhelper"; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
110 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
111 |
case BSD: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
112 |
return javahome + "/lib/jspawnhelper"; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
113 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
114 |
default: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
115 |
throw new AssertionError("Unsupported platform: " + this); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
116 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
117 |
} |
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
118 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
119 |
String helperPath() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
120 |
return AccessController.doPrivileged( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
121 |
(PrivilegedAction<String>) () -> |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
122 |
helperPath(System.getProperty("java.home"), |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
123 |
System.getProperty("os.arch")) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
124 |
); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
125 |
} |
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
126 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
127 |
LaunchMechanism launchMechanism() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
128 |
return AccessController.doPrivileged( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
129 |
(PrivilegedAction<LaunchMechanism>) () -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
130 |
String s = System.getProperty( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
131 |
"jdk.lang.Process.launchMechanism"); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
132 |
LaunchMechanism lm; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
133 |
if (s == null) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
134 |
lm = defaultLaunchMechanism; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
135 |
s = lm.name().toLowerCase(Locale.ENGLISH); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
136 |
} else { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
137 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
138 |
lm = LaunchMechanism.valueOf( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
139 |
s.toUpperCase(Locale.ENGLISH)); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
140 |
} catch (IllegalArgumentException e) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
141 |
lm = null; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
142 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
143 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
144 |
if (lm == null || !validLaunchMechanisms.contains(lm)) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
145 |
throw new Error( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
146 |
s + " is not a supported " + |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
147 |
"process launch mechanism on this platform." |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
148 |
); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
149 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
150 |
return lm; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
151 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
152 |
); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
153 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
154 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
155 |
static Platform get() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
156 |
String osName = AccessController.doPrivileged( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
157 |
(PrivilegedAction<String>) () -> System.getProperty("os.name") |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
158 |
); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
159 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
160 |
if (osName.equals("Linux")) { return LINUX; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
161 |
if (osName.contains("OS X")) { return BSD; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
162 |
if (osName.equals("SunOS")) { return SOLARIS; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
163 |
if (osName.equals("AIX")) { return AIX; } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
164 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
165 |
throw new Error(osName + " is not a supported OS platform."); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
166 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
167 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
168 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
169 |
private static final Platform platform = Platform.get(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
170 |
private static final LaunchMechanism launchMechanism = platform.launchMechanism(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
171 |
private static final byte[] helperpath = toCString(platform.helperPath()); |
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
172 |
|
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
173 |
private static byte[] toCString(String s) { |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
174 |
if (s == null) |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
175 |
return null; |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
176 |
byte[] bytes = s.getBytes(); |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
177 |
byte[] result = new byte[bytes.length + 1]; |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
178 |
System.arraycopy(bytes, 0, |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
179 |
result, 0, |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
180 |
bytes.length); |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
181 |
result[result.length-1] = (byte)0; |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
182 |
return result; |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
183 |
} |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
184 |
|
2 | 185 |
/* this is for the reaping thread */ |
186 |
private native int waitForProcessExit(int pid); |
|
187 |
||
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
188 |
/** |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
189 |
* Creates a process. Depending on the {@code mode} flag, this is done by |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
190 |
* one of the following mechanisms: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
191 |
* <pre> |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
192 |
* 1 - fork(2) and exec(2) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
193 |
* 2 - posix_spawn(3P) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
194 |
* 3 - vfork(2) and exec(2) |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
195 |
* |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
196 |
* (4 - clone(2) and exec(2) - obsolete and currently disabled in native code) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
197 |
* </pre> |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
198 |
* @param fds an array of three file descriptors. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
199 |
* Indexes 0, 1, and 2 correspond to standard input, |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
200 |
* standard output and standard error, respectively. On |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
201 |
* input, a value of -1 means to create a pipe to connect |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
202 |
* child and parent processes. On output, a value which |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
203 |
* is not -1 is the parent pipe fd corresponding to the |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
204 |
* pipe which has been created. An element of this array |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
205 |
* is -1 on input if and only if it is <em>not</em> -1 on |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
206 |
* output. |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
207 |
* @return the pid of the subprocess |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
208 |
*/ |
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
209 |
private native int forkAndExec(int mode, byte[] helperpath, |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
210 |
byte[] prog, |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
211 |
byte[] argBlock, int argc, |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
212 |
byte[] envBlock, int envc, |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
213 |
byte[] dir, |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
214 |
int[] fds, |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
215 |
boolean redirectErrorStream) |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
216 |
throws IOException; |
2 | 217 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
218 |
/** |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
219 |
* The thread pool of "process reaper" daemon threads. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
220 |
*/ |
6516
8c52bb671f3e
6980747: Runtime.exec can fail due to SecurityException (lnx)
martin
parents:
5786
diff
changeset
|
221 |
private static final Executor processReaperExecutor = |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
222 |
doPrivileged((PrivilegedAction<Executor>) () -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
223 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
224 |
ThreadGroup tg = Thread.currentThread().getThreadGroup(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
225 |
while (tg.getParent() != null) tg = tg.getParent(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
226 |
ThreadGroup systemThreadGroup = tg; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
227 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
228 |
ThreadFactory threadFactory = grimReaper -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
229 |
// Our thread stack requirement is quite modest. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
230 |
Thread t = new Thread(systemThreadGroup, grimReaper, |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
231 |
"process reaper", 32768); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
232 |
t.setDaemon(true); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
233 |
// A small attempt (probably futile) to avoid priority inversion |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
234 |
t.setPriority(Thread.MAX_PRIORITY); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
235 |
return t; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
236 |
}; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
237 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
238 |
return Executors.newCachedThreadPool(threadFactory); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
239 |
}); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
240 |
|
2 | 241 |
UNIXProcess(final byte[] prog, |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
242 |
final byte[] argBlock, final int argc, |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
243 |
final byte[] envBlock, final int envc, |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
244 |
final byte[] dir, |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
245 |
final int[] fds, |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
246 |
final boolean redirectErrorStream) |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
247 |
throws IOException { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
248 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
249 |
pid = forkAndExec(launchMechanism.ordinal() + 1, |
19399
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
250 |
helperpath, |
e2e5122cd62e
5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
robm
parents:
16860
diff
changeset
|
251 |
prog, |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
252 |
argBlock, argc, |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
253 |
envBlock, envc, |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
254 |
dir, |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
255 |
fds, |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
256 |
redirectErrorStream); |
2 | 257 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
258 |
try { |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
259 |
doPrivileged((PrivilegedExceptionAction<Void>) () -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
260 |
initStreams(fds); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
261 |
return null; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
262 |
}); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
263 |
} catch (PrivilegedActionException ex) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
264 |
throw (IOException) ex.getException(); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
265 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
266 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
267 |
|
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
268 |
static FileDescriptor newFileDescriptor(int fd) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
269 |
FileDescriptor fileDescriptor = new FileDescriptor(); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
270 |
fdAccess.set(fileDescriptor, fd); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
271 |
return fileDescriptor; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
272 |
} |
2 | 273 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
274 |
void initStreams(int[] fds) throws IOException { |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
275 |
switch (platform) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
276 |
case LINUX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
277 |
case BSD: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
278 |
stdin = (fds[0] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
279 |
ProcessBuilder.NullOutputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
280 |
new ProcessPipeOutputStream(fds[0]); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
281 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
282 |
stdout = (fds[1] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
283 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
284 |
new ProcessPipeInputStream(fds[1]); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
285 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
286 |
stderr = (fds[2] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
287 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
288 |
new ProcessPipeInputStream(fds[2]); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
289 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
290 |
processReaperExecutor.execute(() -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
291 |
int exitcode = waitForProcessExit(pid); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
292 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
293 |
synchronized (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
294 |
this.exitcode = exitcode; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
295 |
this.hasExited = true; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
296 |
this.notifyAll(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
297 |
} |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
298 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
299 |
if (stdout instanceof ProcessPipeInputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
300 |
((ProcessPipeInputStream) stdout).processExited(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
301 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
302 |
if (stderr instanceof ProcessPipeInputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
303 |
((ProcessPipeInputStream) stderr).processExited(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
304 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
305 |
if (stdin instanceof ProcessPipeOutputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
306 |
((ProcessPipeOutputStream) stdin).processExited(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
307 |
}); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
308 |
break; |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
309 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
310 |
case SOLARIS: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
311 |
stdin = (fds[0] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
312 |
ProcessBuilder.NullOutputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
313 |
new BufferedOutputStream( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
314 |
new FileOutputStream(newFileDescriptor(fds[0]))); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
315 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
316 |
stdout = (fds[1] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
317 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
318 |
new BufferedInputStream( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
319 |
stdout_inner_stream = |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
320 |
new DeferredCloseInputStream( |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
321 |
newFileDescriptor(fds[1]))); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
322 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
323 |
stderr = (fds[2] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
324 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
325 |
new DeferredCloseInputStream(newFileDescriptor(fds[2])); |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
326 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
327 |
/* |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
328 |
* For each subprocess forked a corresponding reaper task |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
329 |
* is submitted. That task is the only thread which waits |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
330 |
* for the subprocess to terminate and it doesn't hold any |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
331 |
* locks while doing so. This design allows waitFor() and |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
332 |
* exitStatus() to be safely executed in parallel (and they |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
333 |
* need no native code). |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
334 |
*/ |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
335 |
processReaperExecutor.execute(() -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
336 |
int exitcode = waitForProcessExit(pid); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
337 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
338 |
synchronized (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
339 |
this.exitcode = exitcode; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
340 |
this.hasExited = true; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
341 |
this.notifyAll(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
342 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
343 |
}); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
344 |
break; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
345 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
346 |
case AIX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
347 |
stdin = (fds[0] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
348 |
ProcessBuilder.NullOutputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
349 |
new ProcessPipeOutputStream(fds[0]); |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
350 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
351 |
stdout = (fds[1] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
352 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
353 |
new DeferredCloseProcessPipeInputStream(fds[1]); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
354 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
355 |
stderr = (fds[2] == -1) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
356 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
357 |
new DeferredCloseProcessPipeInputStream(fds[2]); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
358 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
359 |
processReaperExecutor.execute(() -> { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
360 |
int exitcode = waitForProcessExit(pid); |
6669
8f8d4d5768ae
6981138: (process) Process.waitFor() may hang if subprocess has live descendants (lnx)
martin
parents:
6516
diff
changeset
|
361 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
362 |
synchronized (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
363 |
this.exitcode = exitcode; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
364 |
this.hasExited = true; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
365 |
this.notifyAll(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
366 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
367 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
368 |
if (stdout instanceof DeferredCloseProcessPipeInputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
369 |
((DeferredCloseProcessPipeInputStream) stdout).processExited(); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
370 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
371 |
if (stderr instanceof DeferredCloseProcessPipeInputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
372 |
((DeferredCloseProcessPipeInputStream) stderr).processExited(); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
373 |
|
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
374 |
if (stdin instanceof ProcessPipeOutputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
375 |
((ProcessPipeOutputStream) stdin).processExited(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
376 |
}); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
377 |
break; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
378 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
379 |
default: throw new AssertionError("Unsupported platform: " + platform); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
380 |
} |
2 | 381 |
} |
382 |
||
383 |
public OutputStream getOutputStream() { |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
384 |
return stdin; |
2 | 385 |
} |
386 |
||
387 |
public InputStream getInputStream() { |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
388 |
return stdout; |
2 | 389 |
} |
390 |
||
391 |
public InputStream getErrorStream() { |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
392 |
return stderr; |
2 | 393 |
} |
394 |
||
395 |
public synchronized int waitFor() throws InterruptedException { |
|
396 |
while (!hasExited) { |
|
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
397 |
wait(); |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
398 |
} |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
399 |
return exitcode; |
2 | 400 |
} |
401 |
||
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
402 |
@Override |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
403 |
public synchronized boolean waitFor(long timeout, TimeUnit unit) |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
404 |
throws InterruptedException |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
405 |
{ |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
406 |
if (hasExited) return true; |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
407 |
if (timeout <= 0) return false; |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
408 |
|
27732
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
409 |
long remainingNanos = unit.toNanos(timeout); |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
410 |
long deadline = System.nanoTime() + remainingNanos; |
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
411 |
|
27732
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
412 |
do { |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
413 |
// Round up to next millisecond |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
414 |
wait(TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L)); |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
415 |
if (hasExited) { |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
416 |
return true; |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
417 |
} |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
418 |
remainingNanos = deadline - System.nanoTime(); |
31d7da6e79bf
8064932: java/lang/ProcessBuilder/Basic.java: waitFor didn't take long enough
rriggs
parents:
25859
diff
changeset
|
419 |
} while (remainingNanos > 0); |
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
420 |
return hasExited; |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
421 |
} |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
422 |
|
2 | 423 |
public synchronized int exitValue() { |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
424 |
if (!hasExited) { |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
425 |
throw new IllegalThreadStateException("process hasn't exited"); |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
426 |
} |
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
427 |
return exitcode; |
2 | 428 |
} |
429 |
||
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
430 |
private static native void destroyProcess(int pid, boolean force); |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
431 |
|
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
432 |
private void destroy(boolean force) { |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
433 |
switch (platform) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
434 |
case LINUX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
435 |
case BSD: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
436 |
case AIX: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
437 |
// There is a risk that pid will be recycled, causing us to |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
438 |
// kill the wrong process! So we only terminate processes |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
439 |
// that appear to still be running. Even with this check, |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
440 |
// there is an unavoidable race condition here, but the window |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
441 |
// is very small, and OSes try hard to not recycle pids too |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
442 |
// soon, so this is quite safe. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
443 |
synchronized (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
444 |
if (!hasExited) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
445 |
destroyProcess(pid, force); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
446 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
447 |
try { stdin.close(); } catch (IOException ignored) {} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
448 |
try { stdout.close(); } catch (IOException ignored) {} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
449 |
try { stderr.close(); } catch (IOException ignored) {} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
450 |
break; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
451 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
452 |
case SOLARIS: |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
453 |
// There is a risk that pid will be recycled, causing us to |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
454 |
// kill the wrong process! So we only terminate processes |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
455 |
// that appear to still be running. Even with this check, |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
456 |
// there is an unavoidable race condition here, but the window |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
457 |
// is very small, and OSes try hard to not recycle pids too |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
458 |
// soon, so this is quite safe. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
459 |
synchronized (this) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
460 |
if (!hasExited) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
461 |
destroyProcess(pid, force); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
462 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
463 |
stdin.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
464 |
if (stdout_inner_stream != null) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
465 |
stdout_inner_stream.closeDeferred(stdout); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
466 |
if (stderr instanceof DeferredCloseInputStream) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
467 |
((DeferredCloseInputStream) stderr) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
468 |
.closeDeferred(stderr); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
469 |
} catch (IOException e) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
470 |
// ignore |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
471 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
472 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
473 |
break; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
474 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
475 |
default: throw new AssertionError("Unsupported platform: " + platform); |
48
dc5744ca15ea
4960438: (process) Need IO redirection API for subprocesses
martin
parents:
2
diff
changeset
|
476 |
} |
2 | 477 |
} |
478 |
||
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
479 |
public void destroy() { |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
480 |
destroy(false); |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
481 |
} |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
482 |
|
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
483 |
@Override |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
484 |
public Process destroyForcibly() { |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
485 |
destroy(true); |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
486 |
return this; |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
487 |
} |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
488 |
|
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
489 |
@Override |
24577 | 490 |
public long getPid() { |
491 |
return pid; |
|
492 |
} |
|
493 |
||
494 |
@Override |
|
13149
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
495 |
public synchronized boolean isAlive() { |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
496 |
return !hasExited; |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
497 |
} |
27d52f97a5cc
4244896: (process) Provide System.getPid(), System.killProcess(String pid)
robm
parents:
7668
diff
changeset
|
498 |
|
16860
8fecebee12b0
8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
jzavgren
parents:
13149
diff
changeset
|
499 |
private static native void init(); |
2 | 500 |
|
501 |
static { |
|
16860
8fecebee12b0
8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
jzavgren
parents:
13149
diff
changeset
|
502 |
init(); |
2 | 503 |
} |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
504 |
|
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
505 |
/** |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
506 |
* A buffered input stream for a subprocess pipe file descriptor |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
507 |
* that allows the underlying file descriptor to be reclaimed when |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
508 |
* the process exits, via the processExited hook. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
509 |
* |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
510 |
* This is tricky because we do not want the user-level InputStream to be |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
511 |
* closed until the user invokes close(), and we need to continue to be |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
512 |
* able to read any buffered data lingering in the OS pipe buffer. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
513 |
*/ |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
514 |
private static class ProcessPipeInputStream extends BufferedInputStream { |
21357
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
515 |
private final Object closeLock = new Object(); |
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
516 |
|
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
517 |
ProcessPipeInputStream(int fd) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
518 |
super(new FileInputStream(newFileDescriptor(fd))); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
519 |
} |
22626
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
520 |
private static byte[] drainInputStream(InputStream in) |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
521 |
throws IOException { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
522 |
int n = 0; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
523 |
int j; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
524 |
byte[] a = null; |
22626
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
525 |
while ((j = in.available()) > 0) { |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
526 |
a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j); |
22626
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
527 |
n += in.read(a, n, j); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
528 |
} |
22626
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
529 |
return (a == null || n == a.length) ? a : Arrays.copyOf(a, n); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
530 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
531 |
|
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
532 |
/** Called by the process reaper thread when the process exits. */ |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
533 |
synchronized void processExited() { |
22626
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
534 |
synchronized (closeLock) { |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
535 |
try { |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
536 |
InputStream in = this.in; |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
537 |
// this stream is closed if and only if: in == null |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
538 |
if (in != null) { |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
539 |
byte[] stragglers = drainInputStream(in); |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
540 |
in.close(); |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
541 |
this.in = (stragglers == null) ? |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
542 |
ProcessBuilder.NullInputStream.INSTANCE : |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
543 |
new ByteArrayInputStream(stragglers); |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
544 |
} |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
545 |
} catch (IOException ignored) {} |
758d413359c4
8027348: (process) Enhancement of handling async close of ProcessInputStream
igerasim
parents:
21357
diff
changeset
|
546 |
} |
21357
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
547 |
} |
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
548 |
|
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
549 |
@Override |
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
550 |
public void close() throws IOException { |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
551 |
// BufferedInputStream#close() is not synchronized unlike most other |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
552 |
// methods. Synchronizing helps avoid race with processExited(). |
21357
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
553 |
synchronized (closeLock) { |
eb15eae19cd9
8024521: (process) Async close issues with Process InputStream
igerasim
parents:
19399
diff
changeset
|
554 |
super.close(); |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
555 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
556 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
557 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
558 |
|
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
559 |
/** |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
560 |
* A buffered output stream for a subprocess pipe file descriptor |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
561 |
* that allows the underlying file descriptor to be reclaimed when |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
562 |
* the process exits, via the processExited hook. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
563 |
*/ |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
564 |
private static class ProcessPipeOutputStream extends BufferedOutputStream { |
5786
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
565 |
ProcessPipeOutputStream(int fd) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
566 |
super(new FileOutputStream(newFileDescriptor(fd))); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
567 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
568 |
|
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
569 |
/** Called by the process reaper thread when the process exits. */ |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
570 |
synchronized void processExited() { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
571 |
OutputStream out = this.out; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
572 |
if (out != null) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
573 |
try { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
574 |
out.close(); |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
575 |
} catch (IOException ignored) { |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
576 |
// We know of no reason to get an IOException, but if |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
577 |
// we do, there's nothing else to do but carry on. |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
578 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
579 |
this.out = ProcessBuilder.NullOutputStream.INSTANCE; |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
580 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
581 |
} |
f60ef38202e7
6944584: Improvements to subprocess handling on Unix
martin
parents:
5506
diff
changeset
|
582 |
} |
24369
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
583 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
584 |
// A FileInputStream that supports the deferment of the actual close |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
585 |
// operation until the last pending I/O operation on the stream has |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
586 |
// finished. This is required on Solaris because we must close the stdin |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
587 |
// and stdout streams in the destroy method in order to reclaim the |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
588 |
// underlying file descriptors. Doing so, however, causes any thread |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
589 |
// currently blocked in a read on one of those streams to receive an |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
590 |
// IOException("Bad file number"), which is incompatible with historical |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
591 |
// behavior. By deferring the close we allow any pending reads to see -1 |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
592 |
// (EOF) as they did before. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
593 |
// |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
594 |
private static class DeferredCloseInputStream extends FileInputStream |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
595 |
{ |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
596 |
DeferredCloseInputStream(FileDescriptor fd) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
597 |
super(fd); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
598 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
599 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
600 |
private Object lock = new Object(); // For the following fields |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
601 |
private boolean closePending = false; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
602 |
private int useCount = 0; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
603 |
private InputStream streamToClose; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
604 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
605 |
private void raise() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
606 |
synchronized (lock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
607 |
useCount++; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
608 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
609 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
610 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
611 |
private void lower() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
612 |
synchronized (lock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
613 |
useCount--; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
614 |
if (useCount == 0 && closePending) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
615 |
streamToClose.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
616 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
617 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
618 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
619 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
620 |
// stc is the actual stream to be closed; it might be this object, or |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
621 |
// it might be an upstream object for which this object is downstream. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
622 |
// |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
623 |
private void closeDeferred(InputStream stc) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
624 |
synchronized (lock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
625 |
if (useCount == 0) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
626 |
stc.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
627 |
} else { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
628 |
closePending = true; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
629 |
streamToClose = stc; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
630 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
631 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
632 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
633 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
634 |
public void close() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
635 |
synchronized (lock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
636 |
useCount = 0; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
637 |
closePending = false; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
638 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
639 |
super.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
640 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
641 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
642 |
public int read() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
643 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
644 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
645 |
return super.read(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
646 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
647 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
648 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
649 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
650 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
651 |
public int read(byte[] b) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
652 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
653 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
654 |
return super.read(b); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
655 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
656 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
657 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
658 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
659 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
660 |
public int read(byte[] b, int off, int len) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
661 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
662 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
663 |
return super.read(b, off, len); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
664 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
665 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
666 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
667 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
668 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
669 |
public long skip(long n) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
670 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
671 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
672 |
return super.skip(n); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
673 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
674 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
675 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
676 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
677 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
678 |
public int available() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
679 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
680 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
681 |
return super.available(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
682 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
683 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
684 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
685 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
686 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
687 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
688 |
/** |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
689 |
* A buffered input stream for a subprocess pipe file descriptor |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
690 |
* that allows the underlying file descriptor to be reclaimed when |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
691 |
* the process exits, via the processExited hook. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
692 |
* |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
693 |
* This is tricky because we do not want the user-level InputStream to be |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
694 |
* closed until the user invokes close(), and we need to continue to be |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
695 |
* able to read any buffered data lingering in the OS pipe buffer. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
696 |
* |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
697 |
* On AIX this is especially tricky, because the 'close()' system call |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
698 |
* will block if another thread is at the same time blocked in a file |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
699 |
* operation (e.g. 'read()') on the same file descriptor. We therefore |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
700 |
* combine 'ProcessPipeInputStream' approach used on Linux and Bsd |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
701 |
* with the DeferredCloseInputStream approach used on Solaris. This means |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
702 |
* that every potentially blocking operation on the file descriptor |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
703 |
* increments a counter before it is executed and decrements it once it |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
704 |
* finishes. The 'close()' operation will only be executed if there are |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
705 |
* no pending operations. Otherwise it is deferred after the last pending |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
706 |
* operation has finished. |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
707 |
* |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
708 |
*/ |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
709 |
private static class DeferredCloseProcessPipeInputStream |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
710 |
extends BufferedInputStream { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
711 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
712 |
private final Object closeLock = new Object(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
713 |
private int useCount = 0; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
714 |
private boolean closePending = false; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
715 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
716 |
DeferredCloseProcessPipeInputStream(int fd) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
717 |
super(new FileInputStream(newFileDescriptor(fd))); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
718 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
719 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
720 |
private InputStream drainInputStream(InputStream in) |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
721 |
throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
722 |
int n = 0; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
723 |
int j; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
724 |
byte[] a = null; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
725 |
synchronized (closeLock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
726 |
if (buf == null) // asynchronous close()? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
727 |
return null; // discard |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
728 |
j = in.available(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
729 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
730 |
while (j > 0) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
731 |
a = (a == null) ? new byte[j] : Arrays.copyOf(a, n + j); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
732 |
synchronized (closeLock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
733 |
if (buf == null) // asynchronous close()? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
734 |
return null; // discard |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
735 |
n += in.read(a, n, j); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
736 |
j = in.available(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
737 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
738 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
739 |
return (a == null) ? |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
740 |
ProcessBuilder.NullInputStream.INSTANCE : |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
741 |
new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n)); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
742 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
743 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
744 |
/** Called by the process reaper thread when the process exits. */ |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
745 |
synchronized void processExited() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
746 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
747 |
InputStream in = this.in; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
748 |
if (in != null) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
749 |
InputStream stragglers = drainInputStream(in); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
750 |
in.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
751 |
this.in = stragglers; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
752 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
753 |
} catch (IOException ignored) { } |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
754 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
755 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
756 |
private void raise() { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
757 |
synchronized (closeLock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
758 |
useCount++; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
759 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
760 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
761 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
762 |
private void lower() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
763 |
synchronized (closeLock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
764 |
useCount--; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
765 |
if (useCount == 0 && closePending) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
766 |
closePending = false; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
767 |
super.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
768 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
769 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
770 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
771 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
772 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
773 |
public int read() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
774 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
775 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
776 |
return super.read(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
777 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
778 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
779 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
780 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
781 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
782 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
783 |
public int read(byte[] b) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
784 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
785 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
786 |
return super.read(b); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
787 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
788 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
789 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
790 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
791 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
792 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
793 |
public int read(byte[] b, int off, int len) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
794 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
795 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
796 |
return super.read(b, off, len); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
797 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
798 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
799 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
800 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
801 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
802 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
803 |
public long skip(long n) throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
804 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
805 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
806 |
return super.skip(n); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
807 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
808 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
809 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
810 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
811 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
812 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
813 |
public int available() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
814 |
raise(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
815 |
try { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
816 |
return super.available(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
817 |
} finally { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
818 |
lower(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
819 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
820 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
821 |
|
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
822 |
@Override |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
823 |
public void close() throws IOException { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
824 |
// BufferedInputStream#close() is not synchronized unlike most other |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
825 |
// methods. Synchronizing helps avoid racing with drainInputStream(). |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
826 |
synchronized (closeLock) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
827 |
if (useCount == 0) { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
828 |
super.close(); |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
829 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
830 |
else { |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
831 |
closePending = true; |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
832 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
833 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
834 |
} |
9355f02a63a3
8000975: (process) Merge UNIXProcess.java.bsd & UNIXProcess.java.linux (& .solaris & .aix)
plevart
parents:
23010
diff
changeset
|
835 |
} |
2 | 836 |
} |