mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-18 03:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

natPosixProcess.cc (startProcess): Implement standard streams using FileChannelImpl, not FileDescriptor.

Browse Source 
* java/lang/natPosixProcess.cc (startProcess):  Implement standard
	streams using FileChannelImpl, not FileDescriptor.
	* java/lang/natWin32Process.cc (startProcess):  Likewise.

From-SVN: r78664
This commit is contained in:
Per Bothner 2004-02-29 11:14:20 -08:00
parent 3ae1e52c91
commit 881ad9e405
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/java/lang/natPosixProcess.cc
View File

@ -32,11 +32,14 @@ details. */
#include <java/lang/Thread.h>
#include <java/io/File.h>
#include <java/io/FileDescriptor.h>
#include <gnu/java/nio/channels/FileChannelImpl.h>
#include <java/io/FileInputStream.h>
#include <java/io/FileOutputStream.h>
#include <java/io/IOException.h>
#include <java/lang/OutOfMemoryError.h>
using gnu::java::nio::channels::FileChannelImpl;
extern char **environ;
void
@ -187,9 +190,9 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
// We create the streams before forking. Otherwise if we had an
// error while creating the streams we would have run the child
// with no way to communicate with it.
errorStream = new FileInputStream (new FileDescriptor (errp[0]));
inputStream = new FileInputStream (new FileDescriptor (inp[0]));
outputStream = new FileOutputStream (new FileDescriptor (outp[1]));
errorStream = new FileInputStream (new FileChannelImpl(errp[0], FileChannelImpl::READ));
inputStream = new FileInputStream (new FileChannelImpl(inp[0], FileChannelImpl::READ));
outputStream = new FileOutputStream (new FileChannelImpl(outp[0], FileChannelImpl::WRITE));
// We don't use vfork() because that would cause the local
// environment to be set by the child.

18
libjava/java/lang/natWin32Process.cc
View File

@ -25,6 +25,9 @@ details. */
#include <java/io/FileOutputStream.h>
#include <java/io/IOException.h>
#include <java/lang/OutOfMemoryError.h>
#include <gnu/java/nio/channels/FileChannelImpl.h>
using gnu::java::nio::channels::FileChannelImpl;
void
java::lang::ConcreteProcess::cleanup (void)
@ -282,12 +285,15 @@ java::lang::ConcreteProcess::startProcess (jstringArray progarray,
ChildProcessPipe aChildStdOut(ChildProcessPipe::OUTPUT);
ChildProcessPipe aChildStdErr(ChildProcessPipe::OUTPUT);
outputStream = new FileOutputStream (new FileDescriptor (
(jint) aChildStdIn.getParentHandle ()));
inputStream = new FileInputStream (new FileDescriptor (
(jint) aChildStdOut.getParentHandle ()));
errorStream = new FileInputStream (new FileDescriptor (
(jint) aChildStdErr.getParentHandle ()));
outputStream = new FileOutputStream (new FileChannelImpl (
(jint) aChildStdIn.getParentHandle (),
FileChannelImpl::WRITE));
inputStream = new FileInputStream (new FileChannelImpl (
(jint) aChildStdOut.getParentHandle (),
FileChannelImpl::READ));
errorStream = new FileInputStream (new FileChannelImpl (
(jint) aChildStdErr.getParentHandle (),
FileChannelImpl::READ));
// Now create the child process.
PROCESS_INFORMATION pi;