changeset in /hg/icedtea: Copy the appropriate UNIXProcess.java ...
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Thu May 29 14:13:51 PDT 2008
changeset d128eb8455f3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d128eb8455f3
description:
Copy the appropriate UNIXProcess.java as needed.
diffstat:
7 files changed, 67 insertions(+), 225 deletions(-)
ChangeLog | 12 +
Makefile.am | 12 +
Makefile.in | 13 +-
acinclude.m4 | 16 ++
configure | 18 ++
configure.ac | 1
generated/java/lang/UNIXProcess.java | 220 ----------------------------------
diffs (420 lines):
diff -r ce1bb859b93e -r d128eb8455f3 ChangeLog
--- a/ChangeLog Sat May 24 00:36:09 2008 +0100
+++ b/ChangeLog Sun May 25 20:41:45 2008 +0100
@@ -1,3 +1,15 @@ 2008-05-24 Andrew John Hughes <gnu_and
+2008-05-25 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * generated/java/lang/UNIXProcess.java:
+ Removed.
+ * Makefile.am:
+ Copy appropriate UNIXProcess.java to generated.
+ * Makefile.in: Regenerated.
+ * acinclude.m4:
+ (SET_OS): Work out the BUILD_OS variable.
+ * configure: Regenerated.
+ * configure.ac: Run SET_OS.
+
2008-05-24 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Revert OpenJDK patches
diff -r ce1bb859b93e -r d128eb8455f3 Makefile.am
--- a/Makefile.am Sat May 24 00:36:09 2008 +0100
+++ b/Makefile.am Sun May 25 20:41:45 2008 +0100
@@ -779,6 +779,11 @@ clean-copy:
rm -rf rt/$$copy_dir ; \
done
+stamps/generated.stamp:
+ cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \
+ $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ;
+ touch stamps/generated.stamp
+
SHARE = openjdk/jdk/src/share/classes
SOLARIS = openjdk/jdk/src/solaris/classes
LANGTOOLS = openjdk/langtools/src/share/classes
@@ -823,7 +828,8 @@ hotspot-tools-source-files.txt: stamps/c
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
+stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
+ stamps/generated.stamp
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
@@ -868,7 +874,7 @@ rt-source-files.txt: stamps/clone.stamp
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
-stamps/rt-class-files.stamp: rt-source-files.txt
+stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
@@ -1005,6 +1011,8 @@ copy-source-files: stamps/copy-source-fi
download: stamps/download.stamp
+generated: stamps/generated.stamp
+
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
icedtea-ecj: stamps/icedtea-ecj.stamp
diff -r ce1bb859b93e -r d128eb8455f3 Makefile.in
--- a/Makefile.in Sat May 24 00:36:09 2008 +0100
+++ b/Makefile.in Sun May 25 20:41:45 2008 +0100
@@ -94,6 +94,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BUILD_ARCH_DIR = @BUILD_ARCH_DIR@
+BUILD_OS = @BUILD_OS@
CACAO = @CACAO@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
@@ -1227,6 +1228,11 @@ clean-copy:
rm -rf rt/$$copy_dir ; \
done
+stamps/generated.stamp:
+ cp $(SOLARIS)/java/lang/UNIXProcess.java.$(BUILD_OS) \
+ $(abs_top_srcdir)/generated/java/lang/UNIXProcess.java ;
+ touch stamps/generated.stamp
+
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/patch.stamp stamps/overlay.stamp
for copy_dir in `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
@@ -1261,7 +1267,8 @@ hotspot-tools-source-files.txt: stamps/c
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
-stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
+stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt \
+ stamps/generated.stamp
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools -bootclasspath '' -source 1.6 \
@@ -1306,7 +1313,7 @@ rt-source-files.txt: stamps/clone.stamp
rt-source-files.txt: stamps/clone.stamp stamps/copy-source-files.stamp
find rt -name '*.java' | sort > $@
-stamps/rt-class-files.stamp: rt-source-files.txt
+stamps/rt-class-files.stamp: rt-source-files.txt stamps/generated.stamp
mkdir -p lib/rt
if ! test -f stamps/icedtea-ecj.stamp ; \
then \
@@ -1443,6 +1450,8 @@ copy-source-files: stamps/copy-source-fi
download: stamps/download.stamp
+generated: stamps/generated.stamp
+
icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
icedtea-ecj: stamps/icedtea-ecj.stamp
diff -r ce1bb859b93e -r d128eb8455f3 acinclude.m4
--- a/acinclude.m4 Sat May 24 00:36:09 2008 +0100
+++ b/acinclude.m4 Sun May 25 20:41:45 2008 +0100
@@ -664,3 +664,19 @@ AC_DEFUN([AC_CHECK_WITH_CACAO],
AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno")
AC_SUBST(CACAO)
])
+
+AC_DEFUN([SET_OS],
+[
+ case "${host_os}" in
+ linux-gnu)
+ BUILD_OS=linux
+ ;;
+ solaris*)
+ BUILD_OS=solaris
+ ;;
+ *)
+ BUILD_OS=$(uname -o)
+ ;;
+ esac
+ AC_SUBST(BUILD_OS)
+])
diff -r ce1bb859b93e -r d128eb8455f3 configure
--- a/configure Sat May 24 00:36:09 2008 +0100
+++ b/configure Sun May 25 20:41:45 2008 +0100
@@ -737,6 +737,7 @@ PARALLEL_JOBS
PARALLEL_JOBS
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
+BUILD_OS
JAVA
JAVAC
JAVAH
@@ -6010,6 +6011,20 @@ fi
+
+ case "${host_os}" in
+ linux-gnu)
+ BUILD_OS=linux
+ ;;
+ solaris*)
+ BUILD_OS=solaris
+ ;;
+ *)
+ BUILD_OS=$(uname -o)
+ ;;
+ esac
+
+
if test "${with_openjdk}" == true
then
JAVA=$SYSTEM_OPENJDK_DIR/bin/java
@@ -13022,6 +13037,7 @@ PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
PARALLEL_JOBS!$PARALLEL_JOBS$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
+BUILD_OS!$BUILD_OS$ac_delim
JAVA!$JAVA$ac_delim
JAVAC!$JAVAC$ac_delim
JAVAH!$JAVAH$ac_delim
@@ -13091,7 +13107,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r ce1bb859b93e -r d128eb8455f3 configure.ac
--- a/configure.ac Sat May 24 00:36:09 2008 +0100
+++ b/configure.ac Sun May 25 20:41:45 2008 +0100
@@ -165,6 +165,7 @@ AC_SUBST(PARALLEL_JOBS)
AC_SUBST(PARALLEL_JOBS)
SET_ARCH_DIRS
+SET_OS
if test "${with_openjdk}" == true
then
JAVA=$SYSTEM_OPENJDK_DIR/bin/java
diff -r ce1bb859b93e -r d128eb8455f3 generated/java/lang/UNIXProcess.java
--- a/generated/java/lang/UNIXProcess.java Sat May 24 00:36:09 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
- */
-
-package java.lang;
-
-import java.io.*;
-
-/* java.lang.Process subclass in the UNIX environment.
- *
- * @author Mario Wolczko and Ross Knippel.
- * @author Konstantin Kladko (ported to Linux)
- */
-
-final class UNIXProcess extends Process {
- private FileDescriptor stdin_fd;
- private FileDescriptor stdout_fd;
- private FileDescriptor stderr_fd;
- private int pid;
- private int exitcode;
- private boolean hasExited;
-
- private OutputStream stdin_stream;
- private InputStream stdout_stream;
- private InputStream stderr_stream;
-
- /* this is for the reaping thread */
- private native int waitForProcessExit(int pid);
-
- private native int forkAndExec(byte[] prog,
- byte[] argBlock, int argc,
- byte[] envBlock, int envc,
- byte[] dir,
- boolean redirectErrorStream,
- FileDescriptor stdin_fd,
- FileDescriptor stdout_fd,
- FileDescriptor stderr_fd)
- throws IOException;
-
- /* In the process constructor we wait on this gate until the process */
- /* has been created. Then we return from the constructor. */
- /* fork() is called by the same thread which later waits for the process */
- /* to terminate */
-
- private static class Gate {
-
- private boolean exited = false;
- private IOException savedException;
-
- synchronized void exit() { /* Opens the gate */
- exited = true;
- this.notify();
- }
-
- synchronized void waitForExit() { /* wait until the gate is open */
- boolean interrupted = false;
- while (!exited) {
- try {
- this.wait();
- } catch (InterruptedException e) {
- interrupted = true;
- }
- }
- if (interrupted) {
- Thread.currentThread().interrupt();
- }
- }
-
- void setException (IOException e) {
- savedException = e;
- }
-
- IOException getException() {
- return savedException;
- }
- }
-
- UNIXProcess(final byte[] prog,
- final byte[] argBlock, final int argc,
- final byte[] envBlock, final int envc,
- final byte[] dir,
- final boolean redirectErrorStream)
- throws IOException {
- stdin_fd = new FileDescriptor();
- stdout_fd = new FileDescriptor();
- stderr_fd = new FileDescriptor();
-
- final Gate gate = new Gate();
- /*
- * For each subprocess forked a corresponding reaper thread
- * is started. That thread is the only thread which waits
- * for the subprocess to terminate and it doesn't hold any
- * locks while doing so. This design allows waitFor() and
- * exitStatus() to be safely executed in parallel (and they
- * need no native code).
- */
-
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- Thread t = new Thread("process reaper") {
- public void run() {
- try {
- pid = forkAndExec(prog,
- argBlock, argc,
- envBlock, envc,
- dir,
- redirectErrorStream,
- stdin_fd, stdout_fd, stderr_fd);
- } catch (IOException e) {
- gate.setException(e); /*remember to rethrow later*/
- gate.exit();
- return;
- }
- java.security.AccessController.doPrivileged(
- new java.security.PrivilegedAction() {
- public Object run() {
- stdin_stream = new BufferedOutputStream(new
- FileOutputStream(stdin_fd));
- stdout_stream = new BufferedInputStream(new
- FileInputStream(stdout_fd));
- stderr_stream = new FileInputStream(stderr_fd);
- return null;
- }
- });
- gate.exit(); /* exit from constructor */
- int res = waitForProcessExit(pid);
- synchronized (UNIXProcess.this) {
- hasExited = true;
- exitcode = res;
- UNIXProcess.this.notifyAll();
- }
- }
- };
- t.setDaemon(true);
- t.start();
- return null;
- }
- });
- gate.waitForExit();
- IOException e = gate.getException();
- if (e != null)
- throw new IOException(e.toString());
- }
-
- public OutputStream getOutputStream() {
- return stdin_stream;
- }
-
- public InputStream getInputStream() {
- return stdout_stream;
- }
-
- public InputStream getErrorStream() {
- return stderr_stream;
- }
-
- public synchronized int waitFor() throws InterruptedException {
- while (!hasExited) {
- wait();
- }
- return exitcode;
- }
-
- public synchronized int exitValue() {
- if (!hasExited) {
- throw new IllegalThreadStateException("process hasn't exited");
- }
- return exitcode;
- }
-
- private static native void destroyProcess(int pid);
- public void destroy() {
- // There is a risk that pid will be recycled, causing us to
- // kill the wrong process! So we only terminate processes
- // that appear to still be running. Even with this check,
- // there is an unavoidable race condition here, but the window
- // is very small, and OSes try hard to not recycle pids too
- // soon, so this is quite safe.
- synchronized (this) {
- if (!hasExited)
- destroyProcess(pid);
- }
- try {
- stdin_stream.close();
- stdout_stream.close();
- stderr_stream.close();
- } catch (IOException e) {
- // ignore
- }
- }
-
- /* This routine initializes JNI field offsets for the class */
- private static native void initIDs();
-
- static {
- initIDs();
- }
-}
More information about the distro-pkg-dev
mailing list