summaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
authordaney <daney@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-16 21:23:10 +0000
committerdaney <daney@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-16 21:23:10 +0000
commitfd5196b37b3dae3014903c3baf5900660aaa0c82 (patch)
tree295acd745105a2a979167a2ab8599425ebc13058 /libjava/java
parentaba3c45755760e6466f6e9cf4cdadd48010775c8 (diff)
downloadgcc-fd5196b37b3dae3014903c3baf5900660aaa0c82.tar.gz
* java/lang/Thread.java (Thread(ThreadGroup, Runnable, String)): Pass
new parameter constructor. (Thread(ThreadGroup, Runnable, String, long)): Same. (Thread(String, boolean)): New constructor. (Thread(Thread, ThreadGroup, Runnable, String): Add parameter noInheritableThreadLocal, don't call InheritableThreadLocal.newChildThread if set. * java/lang/PosixProcess.java(ProcessManager()): Set noInheritableThreadLocal in super. * java/lang/natThread.cc (_Jv_AttachCurrentThread): Pass new parameter to Thread constructor. (_Jv_AttachCurrentThreadAsDaemon): Same. * java/lang/Thread.h: Regenerate. * classpath/lib/java/lang/Thread.class: Same. * classpath/lib/java/lang/PosixProcess$EOFInputStream.class: Same. * classpath/lib/java/lang/PosixProcess.class: Same. * classpath/lib/java/lang/Thread$State.class: Same. * classpath/lib/java/lang/PosixProcess$ProcessManager.class: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122054 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/lang/PosixProcess.java7
-rw-r--r--libjava/java/lang/Thread.h4
-rw-r--r--libjava/java/lang/Thread.java27
-rw-r--r--libjava/java/lang/natThread.cc4
4 files changed, 34 insertions, 8 deletions
diff --git a/libjava/java/lang/PosixProcess.java b/libjava/java/lang/PosixProcess.java
index 23e1da9d698..517e6f33f92 100644
--- a/libjava/java/lang/PosixProcess.java
+++ b/libjava/java/lang/PosixProcess.java
@@ -42,7 +42,12 @@ final class PosixProcess extends Process
ProcessManager()
{
- super("ProcessManager");
+ // Use package private Thread constructor to place us in the
+ // root ThreadGroup with no InheritableThreadLocal. If the
+ // InheritableThreadLocals were allowed to initialize, they could
+ // cause a Runtime.exec() to be called causing infinite
+ // recursion.
+ super("ProcessManager", true);
// Don't keep the (main) process from exiting on our account.
this.setDaemon(true);
}
diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h
index bef9dd8d5f7..b9116b1aad2 100644
--- a/libjava/java/lang/Thread.h
+++ b/libjava/java/lang/Thread.h
@@ -53,8 +53,10 @@ public:
Thread(::java::lang::Runnable *, ::java::lang::String *);
Thread(::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *);
Thread(::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *, jlong);
+public: // actually package-private
+ Thread(::java::lang::String *, jboolean);
private:
- Thread(::java::lang::Thread *, ::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *);
+ Thread(::java::lang::Thread *, ::java::lang::ThreadGroup *, ::java::lang::Runnable *, ::java::lang::String *, jboolean);
public:
static jint activeCount();
virtual void checkAccess();
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java
index 84682f3fb83..1e1e860cea0 100644
--- a/libjava/java/lang/Thread.java
+++ b/libjava/java/lang/Thread.java
@@ -355,7 +355,7 @@ public class Thread implements Runnable
*/
public Thread(ThreadGroup group, Runnable target, String name)
{
- this(currentThread(), group, target, name);
+ this(currentThread(), group, target, name, false);
}
/**
@@ -381,10 +381,26 @@ public class Thread implements Runnable
public Thread(ThreadGroup group, Runnable target, String name, long size)
{
// Just ignore stackSize for now.
- this(currentThread(), group, target, name);
+ this(currentThread(), group, target, name, false);
}
- private Thread (Thread current, ThreadGroup g, Runnable r, String n)
+ /**
+ * Allocate a new Thread object for threads used internally to the
+ * run time. Runtime threads should not be members of an
+ * application ThreadGroup, nor should they execute arbitrary user
+ * code as part of the InheritableThreadLocal protocol.
+ *
+ * @param name the name for the Thread
+ * @param noInheritableThreadLocal if true, do not initialize
+ * InheritableThreadLocal variables for this thread.
+ * @throws IllegalThreadStateException if group is destroyed
+ */
+ Thread(String name, boolean noInheritableThreadLocal)
+ {
+ this(null, null, null, name, noInheritableThreadLocal);
+ }
+
+ private Thread (Thread current, ThreadGroup g, Runnable r, String n, boolean noInheritableThreadLocal)
{
// Make sure the current thread may create a new thread.
checkAccess();
@@ -424,7 +440,10 @@ public class Thread implements Runnable
int pri = current.getPriority();
priority = (gmax < pri ? gmax : pri);
contextClassLoader = current.contextClassLoader;
- InheritableThreadLocal.newChildThread(this);
+ // InheritableThreadLocal allows arbitrary user code to be
+ // executed, only do this if our caller desires it.
+ if (!noInheritableThreadLocal)
+ InheritableThreadLocal.newChildThread(this);
}
else
{
diff --git a/libjava/java/lang/natThread.cc b/libjava/java/lang/natThread.cc
index 8a09f4f1a0f..42f18c4eb3a 100644
--- a/libjava/java/lang/natThread.cc
+++ b/libjava/java/lang/natThread.cc
@@ -490,7 +490,7 @@ _Jv_AttachCurrentThread(jstring name, java::lang::ThreadGroup* group)
return thread;
if (name == NULL)
name = java::lang::Thread::gen_name ();
- thread = new java::lang::Thread (NULL, group, NULL, name);
+ thread = new java::lang::Thread (NULL, group, NULL, name, false);
_Jv_AttachCurrentThread (thread);
_Jv_NotifyThreadStart (thread);
return thread;
@@ -504,7 +504,7 @@ _Jv_AttachCurrentThreadAsDaemon(jstring name, java::lang::ThreadGroup* group)
return thread;
if (name == NULL)
name = java::lang::Thread::gen_name ();
- thread = new java::lang::Thread (NULL, group, NULL, name);
+ thread = new java::lang::Thread (NULL, group, NULL, name, false);
thread->setDaemon (true);
_Jv_AttachCurrentThread (thread);
_Jv_NotifyThreadStart (thread);
View Lorry Controller Status