diff options
| author | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-12 17:37:55 +0000 |
|---|---|---|
| committer | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-05-12 17:37:55 +0000 |
| commit | 3ae2779cfde8af1a2190cb58cc1f6482cf95d8b0 (patch) | |
| tree | c786d0bbe368ad9664be7de23b5d9d5b106c0f34 /libjava/java/lang/PosixProcess.h | |
| parent | a540e2fee77d3352a3c91f4df0f6d3f34380a0d6 (diff) | |
| download | gcc-3ae2779cfde8af1a2190cb58cc1f6482cf95d8b0.tar.gz | |
PR libgcj/29324
* include/posix-threads.h (_Jv_BlockSigchld): Declare.
(_Jv_UnBlockSigchld): Same.
* posix-threads.cc: Include posix-threads.h.
(block_sigchld) Rename to...
(_Jv_BlockSigchld) ... this.
(_Jv_UnBlockSigchld): New function.
(_Jv_InitThreads): Call _Jv_BlockSigchld in place of block_sigchld.
(_Jv_ThreadStart): Same.
* java/lang/PosixProcess$ProcessManager.h: Regenerate.
* java/lang/PosixProcess.java: Clean up imports.
(ProcessManager): Make final.
(ProcessManager.queue): Genericise and make private.
(ProcessManager.pidToProcess): Remove.
(ProcessManager.liveProcesses): New field.
(ProcessManager.reaperPID): Remove.
(ProcessManager.nativeData): New field.
(ProcessManager.removeProcessFromMap): Remove.
(ProcessManager.addProcessToMap):Remove.
(ProcessManager.addToLiveProcesses): New method.
(ProcessManager.run): Rewritten.
(ProcessManager.reap): Change method signature,
(getErrorStream): Correct formatting.
(getInputStream): Same.
(spawn): Add process to liveProcesses list.
(pid): Make package private.
* java/lang/PosixProcess.h: Regenerate.
* java/lang/natPosixProcess.cc: Include posix.h and posix-threads.h.
Add useing namespace java::lang.
(ProcessManagerInternal): New struct.
(sigchld_handler): Rewritten.
(init): Rewritten.
(waitForSignal): Same.
(reap): Same.
(signalReaper): Same.
(nativeDestroy): Call kill as ::kill.
(nativeSpawn): Correct formatting.
* classpath/lib/java/lang/PosixProcess$EOFInputStream.class: Regenerate.
* classpath/lib/java/lang/PosixProcess.class: Same.
* classpath/lib/java/lang/PosixProcess$ProcessManager.class: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124638 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/PosixProcess.h')
| -rw-r--r-- | libjava/java/lang/PosixProcess.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libjava/java/lang/PosixProcess.h b/libjava/java/lang/PosixProcess.h index a43fa0739d5..3254f5224ce 100644 --- a/libjava/java/lang/PosixProcess.h +++ b/libjava/java/lang/PosixProcess.h @@ -32,17 +32,16 @@ private: void nativeSpawn(); public: // actually package-private PosixProcess(JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, ::java::io::File *, jboolean); - static jlong access$0(::java::lang::PosixProcess *); - static ::java::lang::Object * access$1(); - static void access$2(::java::lang::PosixProcess$ProcessManager *); + static ::java::lang::Object * access$0(); + static void access$1(::java::lang::PosixProcess$ProcessManager *); private: JArray< ::java::lang::String * > * __attribute__((aligned(__alignof__( ::java::lang::Process)))) progarray; JArray< ::java::lang::String * > * envp; ::java::io::File * dir; jboolean redirect; ::java::lang::Throwable * exception; - jlong pid; public: // actually package-private + jlong pid; static const jint STATE_WAITING_TO_START = 0; static const jint STATE_RUNNING = 1; static const jint STATE_TERMINATED = 2; |