+2001-09-24 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
+
+ * java/lang/PosixProcess.java (exitValue): Implement here. Throw
+ IllegalThreadStateException if process hasn't exited yet.
+ * java/lang/natPosixProcess.cc (exitValue): Removed.
+ (waitFor): Only check thread interrupted status if waitpid() returned
+ an error. Use WIFEXITED and WEXITSTATUS to process process's exit
+ value.
+
2001-09-22 Anthony Green <green@redhat.com>
* java/security/DummyKeyPairGenerator.java (initialize): New
final class ConcreteProcess extends Process
{
public native void destroy ();
- public native int exitValue ();
+
+ public int exitValue ()
+ {
+ if (! hasExited)
+ throw new IllegalThreadStateException("Process has not exited");
+ return status;
+ }
public InputStream getErrorStream ()
{
}
jint
-java::lang::ConcreteProcess::exitValue (void)
-{
- if (! hasExited)
- {
- int wstat;
- pid_t r = waitpid ((pid_t) pid, &wstat, WNOHANG);
- if (r == -1)
- {
- jstring x = JvNewStringLatin1 (strerror (errno));
- throw new IllegalThreadStateException (x);
- }
-
- hasExited = true;
- // Just use the raw status. FIXME: what is right?
- status = wstat;
- }
-
- return status;
-}
-
-jint
java::lang::ConcreteProcess::waitFor (void)
{
if (! hasExited)
int wstat;
int r = waitpid ((pid_t) pid, &wstat, 0);
- if (r != -1)
+ if (r == -1)
+ {
+ if (java::lang::Thread::interrupted())
+ throw new InterruptedException (JvNewStringLatin1 (strerror
+ (errno)));
+ }
+ else
{
hasExited = true;
- // Just use the raw status. FIXME: what is right?
- status = wstat;
- }
- if (java::lang::Thread::interrupted())
- throw new InterruptedException (JvNewStringLatin1 ("wait interrupted"));
+ if (WIFEXITED (wstat))
+ status = WEXITSTATUS (wstat);
+ else
+ status = -1;
+ }
}
return status;