diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/java/lang/Thread.java | 2 | ||||
| -rw-r--r-- | libjava/java/lang/ThreadGroup.java | 46 | ||||
| -rw-r--r-- | libjava/java/lang/natThread.cc | 2 |
4 files changed, 42 insertions, 17 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 55ef4ce..a6957f8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2000-06-21 Bryce McKinlay <bryce@albatross.co.nz> + + * java/lang/ThreadGroup.java (add(Thread)): Rename to addThread() to + comply with classpath VM spec. + (add(Group)): Rename to addGroup(). + * java/lang/Thread.java (Thread): Use addThread(). + * java/lang/natThread.cc (finish_): Use removeThread(). + 2000-06-20 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/ThreadGroup.java: Merged with classpath. @@ -591,6 +599,7 @@ * include/i386-signal.h (MAKE_THROW_FRAME): Ditto. * include/ppc-signal.h: New file. +>>>>>>> 1.385 2000-05-18 Bryce McKinlay <bryce@albatross.co.nz> * java/lang/Thread.java: Declare `data' as Object, not RawData. diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java index 8be7f60..5b78963 100644 --- a/libjava/java/lang/Thread.java +++ b/libjava/java/lang/Thread.java @@ -220,7 +220,7 @@ public class Thread implements Runnable throw new NullPointerException (); name = n; - group.add(this); + group.addThread(this); runnable = r; data = null; diff --git a/libjava/java/lang/ThreadGroup.java b/libjava/java/lang/ThreadGroup.java index 52d82d7..564c48d 100644 --- a/libjava/java/lang/ThreadGroup.java +++ b/libjava/java/lang/ThreadGroup.java @@ -1,11 +1,28 @@ /* java.lang.ThreadGroup Copyright (C) 1998, 2000 Free Software Foundation, Inc. - -This file is part of libgcj. -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +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., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +As a special exception, if you link this library with other files to +produce an executable, this library does not by itself cause the +resulting executable to be covered by the GNU General Public License. +This exception does not however invalidate any other reasons why the +executable file might be covered by the GNU General Public License. */ package java.lang; @@ -42,8 +59,7 @@ public class ThreadGroup private Vector groups = new Vector(); private boolean daemon_flag = false; private boolean destroyed_flag = false; - - int maxpri = Thread.MAX_PRIORITY; + private int maxpri = Thread.MAX_PRIORITY; private ThreadGroup() { @@ -76,7 +92,7 @@ public class ThreadGroup this.name = name; maxpri = parent.maxpri; daemon_flag = parent.daemon_flag; - parent.add(this); + parent.addGroup(this); } /** Get the name of this ThreadGroup. @@ -416,7 +432,7 @@ public class ThreadGroup throw new IllegalThreadStateException("Already destroyed."); checkDestroy (); if (parent != null) - parent.remove(this); + parent.removeGroup(this); destroyed_flag = true; parent = null; @@ -515,7 +531,7 @@ public class ThreadGroup } // This is called to add a Thread to our internal list. - final void add(Thread t) + final void addThread(Thread t) { if (destroyed_flag) throw new IllegalThreadStateException ("ThreadGroup is destroyed"); @@ -524,7 +540,7 @@ public class ThreadGroup } // This is called to remove a Thread from our internal list. - final void remove(Thread t) + final void removeThread(Thread t) { if (destroyed_flag) throw new IllegalThreadStateException (); @@ -535,19 +551,19 @@ public class ThreadGroup { // We inline destroy to avoid the access check. if (parent != null) - parent.remove(this); + parent.removeGroup(this); destroyed_flag = true; } } // This is called to add a ThreadGroup to our internal list. - final void add(ThreadGroup g) + final void addGroup(ThreadGroup g) { groups.addElement(g); } // This is called to remove a ThreadGroup from our internal list. - final void remove(ThreadGroup g) + final void removeGroup(ThreadGroup g) { groups.removeElement(g); // Daemon groups are automatically destroyed when all their threads die. @@ -555,7 +571,7 @@ public class ThreadGroup { // We inline destroy to avoid the access check. if (parent != null) - parent.remove(this); + parent.removeGroup(this); destroyed_flag = true; } } diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc index 3fe4083..2b9afb5 100644 --- a/libjava/java/lang/natThread.cc +++ b/libjava/java/lang/natThread.cc @@ -175,7 +175,7 @@ java::lang::Thread::finish_ () { natThread *nt = (natThread *) data; - group->remove (this); + group->removeThread (this); #ifdef ENABLE_JVMPI if (_Jv_JVMPI_Notify_THREAD_END) |