diff options
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/InheritableThreadLocal.java | 142 | ||||
| -rw-r--r-- | libjava/java/lang/Thread.java | 23 | ||||
| -rw-r--r-- | libjava/java/lang/ThreadLocal.java | 169 | ||||
| -rw-r--r-- | libjava/java/lang/natThread.cc | 3 |
4 files changed, 25 insertions, 312 deletions
diff --git a/libjava/java/lang/InheritableThreadLocal.java b/libjava/java/lang/InheritableThreadLocal.java deleted file mode 100644 index b58c5bc..0000000 --- a/libjava/java/lang/InheritableThreadLocal.java +++ /dev/null @@ -1,142 +0,0 @@ -/* InheritableThreadLocal -- a ThreadLocal which inherits values across threads - Copyright (C) 2000, 2001, 2002, 2003, 2005 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.lang; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; - -/** - * A ThreadLocal whose value is inherited by child Threads. The value of the - * InheritableThreadLocal associated with the (parent) Thread is copied to - * the new (child) Thread at the moment of creation. - * - * <p>It is possible to make the value associated with the child Thread a - * function of the value that is associated with the parent Thread by - * overriding the <code>childValue()</code> method. The utility of this class - * is in transferring items like User ID or Transaction ID across threads - * automatically. - * - * @author Mark Wielaard (mark@klomp.org) - * @author Eric Blake (ebb9@email.byu.edu) - * @see ThreadLocal - * @since 1.2 - * @status updated to 1.4 - */ -public class InheritableThreadLocal extends ThreadLocal -{ - /** - * Maps Threads to a List of InheritableThreadLocals (the heritage of that - * Thread). Uses a WeakHashMap so if the Thread is garbage collected the - * List can be collected, too. Maps to a list in case the user overrides - * equals. - */ - private static final Map threadMap - = Collections.synchronizedMap(new WeakHashMap()); - - /** - * Creates a new InheritableThreadLocal that has no values associated - * with it yet. - */ - public InheritableThreadLocal() - { - Thread currentThread = Thread.currentThread(); - // Note that we don't have to synchronize, as only this thread will - // ever modify the returned heritage and threadMap is a synchronizedMap. - List heritage = (List) threadMap.get(currentThread); - if (heritage == null) - { - heritage = new ArrayList(); - threadMap.put(currentThread, heritage); - } - heritage.add(this); - } - - /** - * Determines the value associated with a newly created child Thread as a - * function of the value associated with the currently executing (parent) - * Thread. The default implementation just returns the parentValue. - * - * @param parentValue the value of this object in the parent thread at - * the moment of creation of the child - * @return the initial value for the child thread - */ - protected Object childValue(Object parentValue) - { - return parentValue; - } - - /** - * Generates the childValues of all <code>InheritableThreadLocal</code>s - * that are in the heritage of the current Thread for the newly created - * childThread. Should be called from the contructor Thread. - * - * @param childThread the newly created thread, to inherit from this thread - * @see Thread#Thread(ThreadGroup, Runnable, String) - */ - static void newChildThread(Thread childThread) - { - // The currentThread is the parent of the new thread. - Thread parentThread = Thread.currentThread(); - // Note that we don't have to synchronize, as only this thread will - // ever modify the returned heritage and threadMap is a synchronizedMap. - ArrayList heritage = (ArrayList) threadMap.get(parentThread); - if (heritage != null) - { - threadMap.put(childThread, heritage.clone()); - // Perform the inheritance. - Iterator it = heritage.iterator(); - int i = heritage.size(); - while (--i >= 0) - { - InheritableThreadLocal local = (InheritableThreadLocal) it.next(); - Object parentValue = local.valueMap.get(parentThread); - if (parentValue != null) - { - Object childValue = local.childValue(parentValue == NULL - ? null : parentValue); - local.valueMap.put(childThread, (childValue == null - ? NULL : parentValue)); - } - } - } - } -} diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java index fc07f2b..7938498 100644 --- a/libjava/java/lang/Thread.java +++ b/libjava/java/lang/Thread.java @@ -1,5 +1,5 @@ /* Thread -- an independent thread of executable code - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of GNU Classpath. @@ -41,6 +41,8 @@ package java.lang; import gnu.gcj.RawData; import gnu.gcj.RawDataManaged; +import gnu.java.util.WeakIdentityHashMap; +import java.util.Map; /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3 * "The Java Language Specification", ISBN 0-201-63451-1 @@ -125,6 +127,11 @@ public class Thread implements Runnable /** The context classloader for this Thread. */ private ClassLoader contextClassLoader; + /** Thread local storage. Package accessible for use by + * InheritableThreadLocal. + */ + WeakIdentityHashMap locals; + // This describes the top-most interpreter frame for this thread. RawData interp_frame; @@ -914,4 +921,18 @@ public class Thread implements Runnable private final native void initialize_native(); private final native static String gen_name(); + + /** + * Returns the map used by ThreadLocal to store the thread local values. + */ + static Map getThreadLocals() + { + Thread thread = currentThread(); + Map locals = thread.locals; + if (locals == null) + { + locals = thread.locals = new WeakIdentityHashMap(); + } + return locals; + } } diff --git a/libjava/java/lang/ThreadLocal.java b/libjava/java/lang/ThreadLocal.java deleted file mode 100644 index 9ef182e..0000000 --- a/libjava/java/lang/ThreadLocal.java +++ /dev/null @@ -1,169 +0,0 @@ -/* ThreadLocal -- a variable with a unique value per thread - Copyright (C) 2000, 2002, 2003 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.lang; - -import java.util.Collections; -import java.util.Map; -import java.util.WeakHashMap; - - -/** - * ThreadLocal objects have a different state associated with every - * Thread that accesses them. Every access to the ThreadLocal object - * (through the <code>get()</code> and <code>set()</code> methods) - * only affects the state of the object as seen by the currently - * executing Thread. - * - * <p>The first time a ThreadLocal object is accessed on a particular - * Thread, the state for that Thread's copy of the local variable is set by - * executing the method <code>initialValue()</code>. - * </p> - * - * <p>An example how you can use this: - * </p> - * - * <pre> - * class Connection - * { - * private static ThreadLocal owner = new ThreadLocal() - * { - * public Object initialValue() - * { - * return("nobody"); - * } - * }; - * ... - * } - * </pre> - * - * <p>Now all instances of connection can see who the owner of the currently - * executing Thread is by calling <code>owner.get()</code>. By default any - * Thread would be associated with 'nobody'. But the Connection object could - * offer a method that changes the owner associated with the Thread on - * which the method was called by calling <code>owner.put("somebody")</code>. - * (Such an owner changing method should then be guarded by security checks.) - * </p> - * - * <p>When a Thread is garbage collected all references to values of - * the ThreadLocal objects associated with that Thread are removed. - * </p> - * - * @author Mark Wielaard (mark@klomp.org) - * @author Eric Blake (ebb9@email.byu.edu) - * @since 1.2 - * @status updated to 1.4 - */ -public class ThreadLocal -{ - /** - * Placeholder to distinguish between uninitialized and null set by the - * user. Do not expose this to the public. Package visible for use by - * InheritableThreadLocal - */ - static final Object NULL = new Object(); - - /** - * The stored value. Package visible for use by InheritableThreadLocal. */ - Object value; - - /** - * Maps Threads to values. Uses a WeakHashMap so if a Thread is garbage - * collected the reference to the Value will disappear. A null value means - * uninitialized, while NULL means a user-specified null. Only the - * <code>set(Thread, Object)</code> and <code>get(Thread)</code> methods - * access it. Package visible for use by InheritableThreadLocal. - */ - final Map valueMap = Collections.synchronizedMap(new WeakHashMap()); - - /** - * Creates a ThreadLocal object without associating any value to it yet. - */ - public ThreadLocal() - { - } - - /** - * Called once per thread on the first invocation of get(), if set() was - * not already called. The default implementation returns <code>null</code>. - * Often, this method is overridden to create the appropriate initial object - * for the current thread's view of the ThreadLocal. - * - * @return the initial value of the variable in this thread - */ - protected Object initialValue() - { - return null; - } - - /** - * Gets the value associated with the ThreadLocal object for the currently - * executing Thread. If this is the first time the current thread has called - * get(), and it has not already called set(), the value is obtained by - * <code>initialValue()</code>. - * - * @return the value of the variable in this thread - */ - public Object get() - { - Thread currentThread = Thread.currentThread(); - // Note that we don't have to synchronize, as only this thread will - // ever modify the returned value and valueMap is a synchronizedMap. - Object value = valueMap.get(currentThread); - if (value == null) - { - value = initialValue(); - valueMap.put(currentThread, value == null ? NULL : value); - } - return value == NULL ? null : value; - } - - /** - * Sets the value associated with the ThreadLocal object for the currently - * executing Thread. This overrides any existing value associated with the - * current Thread and prevents <code>initialValue()</code> from being - * called if this is the first access to this ThreadLocal in this Thread. - * - * @param value the value to set this thread's view of the variable to - */ - public void set(Object value) - { - // Note that we don't have to synchronize, as only this thread will - // ever modify the returned value and valueMap is a synchronizedMap. - valueMap.put(Thread.currentThread(), value == null ? NULL : value); - } -} diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc index da9dcba..2879df8 100644 --- a/libjava/java/lang/natThread.cc +++ b/libjava/java/lang/natThread.cc @@ -216,6 +216,9 @@ java::lang::Thread::finish_ () // If a method cache was created, free it. _Jv_FreeMethodCache(); + // Clear out thread locals. + locals = NULL; + // Signal any threads that are waiting to join() us. _Jv_MutexLock (&nt->join_mutex); |