[vmkit-commits] [vmkit] r121128 - in /vmkit/branches/multi-vm/lib/J3: Classpath/JavaUpcalls.cpp VMCore/Jnjvm.cpp VMCore/Jnjvm.h

[Gael Thomas]

Author: gthomas
Date: Tue Dec  7 04:32:29 2010
New Revision: 121128

URL: http://llvm.org/viewvc/llvm-project?rev=121128&view=rev
Log:
lazily allocate the java thread specific data of ReferenceThread

Modified:
    vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h

Modified: vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp?rev=121128&r1=121127&r2=121128&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/Classpath/JavaUpcalls.cpp Tue Dec  7 04:32:29 2010
@@ -297,10 +297,6 @@
   initGroup->invokeIntSpecial(vm, threadGroup, SystemGroup);
   systemName = vm->asciizToStr("system");
   groupName->setInstanceObjectField(SystemGroup, systemName);
-
-  // Create the enqueue thread.
-  assert(vm->getReferenceThread() && "VM did not set its enqueue thread");
-  CreateJavaThread(vm, vm->javaReferenceThread, "Reference", SystemGroup);
 }
 
 extern "C" void Java_java_lang_ref_WeakReference__0003Cinit_0003E__Ljava_lang_Object_2(

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp?rev=121128&r1=121127&r2=121128&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.cpp Tue Dec  7 04:32:29 2010
@@ -1077,9 +1077,9 @@
   JnjvmClassLoader* loader = bootstrapLoader;
   
   referenceThread = new ReferenceThread(vmkit);
-	javaReferenceThread = new JavaThread(this, referenceThread);
-	referenceThread->allVmsData[vmID] = javaReferenceThread;
-	referenceThread->attach(this);
+	//javaReferenceThread = new JavaThread(this, referenceThread);
+	//referenceThread->allVmsData[vmID] = javaReferenceThread;
+	//referenceThread->attach(this);
   referenceThread->start(
       (void (*)(mvm::Thread*))ReferenceThread::enqueueStart);
   

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h?rev=121128&r1=121127&r2=121128&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/Jnjvm.h Tue Dec  7 04:32:29 2010
@@ -246,10 +246,6 @@
 	/// javaMainThread - the java main thread
 	JavaThread* javaMainThread;
 
-	/// javaReferenceThread - the java reference thread
-	JavaThread* javaReferenceThread;
-
-
 	mvm::VirtualTable* VMClassLoader__VT;
 
 	void initialiseInternalVTs();