[vmkit-commits] [vmkit] r120473 - in /vmkit/branches/multi-vm: include/mvm/Threads/Thread.h lib/J3/VMCore/JavaThread.cpp lib/J3/VMCore/JavaThread.h lib/J3/VMCore/ReferenceQueue.cpp lib/J3/VMCore/ReferenceQueue.h mmtk/java/build.xml

[Gael Thomas]

Author: gthomas
Date: Tue Nov 30 16:08:42 2010
New Revision: 120473

URL: http://llvm.org/viewvc/llvm-project?rev=120473&view=rev
Log:
fix also build.xml. FinalizerThread and ReferenceThread must inherits mvm::MutatorThread, not mvm::Thread

Modified:
    vmkit/branches/multi-vm/include/mvm/Threads/Thread.h
    vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h
    vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.cpp
    vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.h
    vmkit/branches/multi-vm/mmtk/java/build.xml

Modified: vmkit/branches/multi-vm/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/include/mvm/Threads/Thread.h?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/Threads/Thread.h (original)
+++ vmkit/branches/multi-vm/include/mvm/Threads/Thread.h Tue Nov 30 16:08:42 2010
@@ -139,14 +139,14 @@
 
 
 class ExceptionBuffer;
-class Thread;
+class MutatorThread;
 
 class VMThreadData {
 public:
   /// mut - The associated thread mutator
-	Thread* mut;
+	MutatorThread* mut;
 
-	VMThreadData(Thread* m) {
+	VMThreadData(MutatorThread* m) {
 		this->mut = m;
 	}
 

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.cpp Tue Nov 30 16:08:42 2010
@@ -19,7 +19,7 @@
 
 using namespace j3;
 
-JavaThread::JavaThread(mvm::Thread* mut, Jnjvm* isolate)
+JavaThread::JavaThread(mvm::MutatorThread* mut, Jnjvm* isolate)
 	: mvm::VMThreadData(mut) {
   pendingException = NULL;
   jniEnv = isolate->jniEnv;
@@ -43,7 +43,7 @@
 }
 
 mvm::Thread *JavaThread::create(Jnjvm* isolate) {
-	mvm::Thread *mut = new mvm::MutatorThread();
+	mvm::MutatorThread *mut = new mvm::MutatorThread();
 	JavaThread *th   = new JavaThread(mut, isolate);
   mut->MyVM   = isolate;
 	mut->vmData = th;

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/JavaThread.h Tue Nov 30 16:08:42 2010
@@ -125,7 +125,7 @@
 
   /// JavaThread - Creates a Java thread. 
   ///
-  JavaThread(mvm::Thread*, Jnjvm* isolate);
+  JavaThread(mvm::MutatorThread*, Jnjvm* isolate);
 
   /// create - Creates a Java thread and a mutator thread.
   ///

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.cpp?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.cpp (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.cpp Tue Nov 30 16:08:42 2010
@@ -15,7 +15,7 @@
 
 using namespace j3;
 
-ReferenceThread::ReferenceThread(Jnjvm* vm) : Thread(),
+ReferenceThread::ReferenceThread(Jnjvm* vm) : 
     WeakReferencesQueue(ReferenceQueue::WEAK),
     SoftReferencesQueue(ReferenceQueue::SOFT), 
     PhantomReferencesQueue(ReferenceQueue::PHANTOM) {
@@ -159,7 +159,7 @@
 }
 
 
-FinalizerThread::FinalizerThread(Jnjvm* vm) : Thread() {
+FinalizerThread::FinalizerThread(Jnjvm* vm) {
   FinalizationQueue = new gc*[INITIAL_QUEUE_SIZE];
   QueueLength = INITIAL_QUEUE_SIZE;
   CurrentIndex = 0;

Modified: vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.h?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.h (original)
+++ vmkit/branches/multi-vm/lib/J3/VMCore/ReferenceQueue.h Tue Nov 30 16:08:42 2010
@@ -82,7 +82,7 @@
   void scan(ReferenceThread* thread, uintptr_t closure);
 };
 
-class ReferenceThread : public mvm::Thread {
+class ReferenceThread : public mvm::MutatorThread {
 public:
   /// WeakReferencesQueue - The queue of weak references.
   ///
@@ -138,7 +138,7 @@
   }
 };
 
-class FinalizerThread : public mvm::Thread {
+class FinalizerThread : public mvm::MutatorThread {
 public:
     /// FinalizationQueueLock - A lock to protect access to the queue.
   ///

Modified: vmkit/branches/multi-vm/mmtk/java/build.xml
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/mmtk/java/build.xml?rev=120473&r1=120472&r2=120473&view=diff
==============================================================================
--- vmkit/branches/multi-vm/mmtk/java/build.xml (original)
+++ vmkit/branches/multi-vm/mmtk/java/build.xml Tue Nov 30 16:08:42 2010
@@ -1,7 +1,7 @@
 <project name="MMTK-VMKit" default="main" basedir=".">
   <target name="main">
     <mkdir dir="classes"/>
-    <javac srcdir="/home/ngeoffray/projects/llvm-svn/vmkit/mmtk/java/src" destdir="classes" source="1.5"/>
+    <javac srcdir="src" destdir="classes" source="1.5"/>
     <jar jarfile="mmtk-vmkit.jar">
       <fileset dir="classes"/>
     </jar>