diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-16 01:27:14 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-07-16 01:27:14 +0000 |
commit | a63c2657c94913d72b3cd388730d61edcb09fc69 (patch) | |
tree | 8762d1f992e2f725a6bde1ff966ed6f1e5f4f823 /libjava/java/rmi/dgc | |
parent | 6484dceb0094998183c2f8d3c8c27c6f4e53b8a9 (diff) | |
download | gcc-a63c2657c94913d72b3cd388730d61edcb09fc69.tar.gz |
Major merge with Classpath.
Removed many duplicate files.
* HACKING: Updated.x
* classpath: Imported new directory.
* standard.omit: New file.
* Makefile.in, aclocal.m4, configure: Rebuilt.
* sources.am: New file.
* configure.ac: Run Classpath configure script. Moved code around
to support. Disable xlib AWT peers (temporarily).
* Makefile.am (SUBDIRS): Added 'classpath'
(JAVAC): Removed.
(AM_CPPFLAGS): Added more -I options.
(BOOTCLASSPATH): Simplified.
Completely redid how sources are built.
Include sources.am.
* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
* include/jni.h: Removed (in Classpath).
* scripts/classes.pl: Updated to look at built classes.
* scripts/makemake.tcl: New file.
* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
-I options.
(gcj_jni_invocation_compile_c_to_binary): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/rmi/dgc')
-rw-r--r-- | libjava/java/rmi/dgc/DGC.java | 51 | ||||
-rw-r--r-- | libjava/java/rmi/dgc/Lease.java | 67 | ||||
-rw-r--r-- | libjava/java/rmi/dgc/VMID.java | 138 |
3 files changed, 0 insertions, 256 deletions
diff --git a/libjava/java/rmi/dgc/DGC.java b/libjava/java/rmi/dgc/DGC.java deleted file mode 100644 index e78ec2a3aa7..00000000000 --- a/libjava/java/rmi/dgc/DGC.java +++ /dev/null @@ -1,51 +0,0 @@ -/* DGC.java -- - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath 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 for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package java.rmi.dgc; - -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.server.ObjID; - -public interface DGC extends Remote -{ - Lease dirty (ObjID[] ids, long sequenceNum, Lease lease) - throws RemoteException; - - void clean (ObjID[] ids, long sequenceNum, VMID vmid, boolean strong) - throws RemoteException; -} diff --git a/libjava/java/rmi/dgc/Lease.java b/libjava/java/rmi/dgc/Lease.java deleted file mode 100644 index d3d7f695216..00000000000 --- a/libjava/java/rmi/dgc/Lease.java +++ /dev/null @@ -1,67 +0,0 @@ -/* Lease.java - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath 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 for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package java.rmi.dgc; - -import java.io.Serializable; - -public final class Lease - implements Serializable { - -static final long serialVersionUID = -5713411624328831948L; - -private VMID vmid; -private long value; - -public Lease(VMID id, long duration) { - vmid = id; - value = duration; -} - -public VMID getVMID() { - return (vmid); -} - -public long getValue() { - return (value); -} - -public String toString() { - return ("[" + vmid.toString() + ", " + Long.toString(value) + "]"); -} - -} diff --git a/libjava/java/rmi/dgc/VMID.java b/libjava/java/rmi/dgc/VMID.java deleted file mode 100644 index f960d9ccd79..00000000000 --- a/libjava/java/rmi/dgc/VMID.java +++ /dev/null @@ -1,138 +0,0 @@ -/* VMID.java - Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath 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 for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -package java.rmi.dgc; - -import java.io.Serializable; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.rmi.server.UID; - -public final class VMID implements Serializable -{ - static final long serialVersionUID = -538642295484486218L; - - static final boolean areWeUnique; - - static byte[] localAddr; - - private byte[] addr; - - private UID uid; - - static - { - byte[] addr; - boolean awu = true; - try { - addr = InetAddress.getLocalHost().getAddress(); - if (addr[0] == 127 && addr[1] == 0 && addr[2] == 0 && addr[3] == 1) { - awu = false; - } - } - catch (UnknownHostException _) { - addr = new byte[]{ 127, 0, 0, 1 }; - awu = false; - } - localAddr = addr; - areWeUnique = awu; - } - - public VMID() - { - addr = localAddr; - uid = new UID(); - } - - /** - * @deprecated - */ - public static boolean isUnique () - { - return areWeUnique; - } - - public int hashCode () - { - return super.hashCode(); - } - - public boolean equals (Object obj) - { - if (!(obj instanceof VMID)) - { - return false; - } - - VMID other = (VMID) obj; - if (addr.length != other.addr.length) - { - return false; - } - - for (int i = addr.length - 1; i >= 0; i--) - { - if (addr[i] != other.addr[i]) - { - return false; - } - } - - return uid.equals(other.uid); - } - - public String toString () - { - StringBuffer buf = new StringBuffer ("[VMID: "); - - for (int i = 0; i < addr.length; i++) - { - if (i > 0) - { - buf.append ("."); - } - - buf.append (Integer.toString (addr [i])); - } - - buf.append (" "); - buf.append (uid.toString ()); - buf.append ("]"); - - return buf.toString(); - } -} |