From 734ef6299ca3351ff45f6a5536cb94859304a4aa Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 5 Jan 2006 17:35:20 +0000
Subject: [PATCH] * java/lang/natPosixProcess.cc (reap): Ignore unknown
children.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109383 138bc75d-0d04-0410-961f-82ee72b054a4
---
libjava/ChangeLog | 4 ++++
libjava/java/lang/natPosixProcess.cc | 9 +++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0ee3841b9ed7..a2cc01e4ad71 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-05 Tom Tromey <tromey@redhat.com>
+
+ * java/lang/natPosixProcess.cc (reap): Ignore unknown children.
+
2006-01-04 Krister Walfridsson <cato@df.lth.se>
* posix-threads.cc (_Jv_InitThreads): #ifdef PTHREAD_STACK_MIN
diff --git a/libjava/java/lang/natPosixProcess.cc b/libjava/java/lang/natPosixProcess.cc
index 9a6c3218d4d1..94344fc8e612 100644
--- a/libjava/java/lang/natPosixProcess.cc
+++ b/libjava/java/lang/natPosixProcess.cc
@@ -1,6 +1,6 @@
// natPosixProcess.cc - Native side of POSIX process code.
-/* Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
This file is part of libgcj.
@@ -170,6 +170,8 @@ jboolean java::lang::ConcreteProcess$ProcessManager::reap ()
// Look up the process in our pid map.
ConcreteProcess * process = removeProcessFromMap ((jlong) pid);
+ // Note that if process==NULL, then we have an unknown child.
+ // This is not common, but can happen, and isn't an error.
if (process)
{
JvSynchronize sync (process);
@@ -178,11 +180,6 @@ jboolean java::lang::ConcreteProcess$ProcessManager::reap ()
process->processTerminationCleanup();
process->notifyAll ();
}
- else
- {
- // Unknown child. How did this happen?
- fprintf (stderr, "Reaped unknown child pid = %ld\n", (long) pid);
- }
}
error:
--
GitLab