[vmkit-commits] [vmkit] r120938 - in /vmkit/branches/multi-vm: include/mvm/Threads/Thread.h lib/Mvm/CommonThread/CollectionRV.cpp lib/Mvm/Runtime/VMKit.cpp mmtk/mmtk-j3/ActivePlan.cpp mmtk/mmtk-j3/Scanning.cpp

[Gael Thomas]

Author: gthomas
Date: Sun Dec  5 07:56:37 2010
New Revision: 120938

URL: http://llvm.org/viewvc/llvm-project?rev=120938&view=rev
Log:
rename temporarly CircularBase.next() in next0 and remove useless casts

Modified:
    vmkit/branches/multi-vm/include/mvm/Threads/Thread.h
    vmkit/branches/multi-vm/lib/Mvm/CommonThread/CollectionRV.cpp
    vmkit/branches/multi-vm/lib/Mvm/Runtime/VMKit.cpp
    vmkit/branches/multi-vm/mmtk/mmtk-j3/ActivePlan.cpp
    vmkit/branches/multi-vm/mmtk/mmtk-j3/Scanning.cpp

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=120938&r1=120937&r2=120938&view=diff
==============================================================================
--- vmkit/branches/multi-vm/include/mvm/Threads/Thread.h (original)
+++ vmkit/branches/multi-vm/include/mvm/Threads/Thread.h Sun Dec  5 07:56:37 2010
@@ -60,11 +60,11 @@
 
   /// next - Get the next object in the list.
   ///
-  inline T *next() { return _next; }
+  inline T *next0() { return _next; }
 
   /// prev - Get the previous object in the list.
   ///
-  inline T *prev() { return _prev; }
+  inline T *prev0() { return _prev; }
 
   /// CricularBase - Creates the object as a single element in the list.
   ///
@@ -96,7 +96,7 @@
     T* temp = (T*)this;
     do {
       fprintf(stderr, "%p -> ", (void*)temp);
-      temp = temp->next();
+      temp = temp->next0();
     } while (temp != this);
     fprintf(stderr, "\n");
   }

Modified: vmkit/branches/multi-vm/lib/Mvm/CommonThread/CollectionRV.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/CommonThread/CollectionRV.cpp?rev=120938&r1=120937&r2=120938&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/CommonThread/CollectionRV.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/CommonThread/CollectionRV.cpp Sun Dec  5 07:56:37 2010
@@ -58,15 +58,15 @@
     assert(!cur->doYield);
     cur->doYield = true;
     assert(!cur->joinedRV);
-    cur = (mvm::Thread*)cur->next();
+    cur = cur->next0();
   } while (cur != self);
  
   // The CAS is not necessary but it does a memory barrier. 
   __sync_bool_compare_and_swap(&(self->joinedRV), false, true);
 
   // Lookup currently blocked threads.
-  for (cur = (mvm::Thread*)self->next(); cur != self; 
-       cur = (mvm::Thread*)cur->next()) {
+  for (cur = self->next0(); cur != self; 
+       cur = cur->next0()) {
     if (cur->getLastSP()) {
       nbJoined++;
       cur->joinedRV = true;
@@ -95,8 +95,8 @@
   // be released on finishRV.
   self->vmkit()->vmkitLock.lock();
   
-  for (mvm::Thread* cur = (mvm::Thread*)self->next(); cur != self; 
-       cur = (mvm::Thread*)cur->next()) {
+  for (mvm::Thread* cur = self->next0(); cur != self; 
+       cur = cur->next0()) {
     int res = cur->kill(SIGGC);
     assert(!res && "Error on kill");
   }
@@ -200,7 +200,7 @@
     assert(cur->joinedRV && "Inconsistent state");
     cur->doYield = false;
     cur->joinedRV = false;
-    cur = (mvm::Thread*)cur->next();
+    cur = cur->next0();
   } while (cur != initiator);
 
   assert(nbJoined == initiator->MyVM->NumberOfThreads && "Inconsistent state");

Modified: vmkit/branches/multi-vm/lib/Mvm/Runtime/VMKit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/lib/Mvm/Runtime/VMKit.cpp?rev=120938&r1=120937&r2=120938&view=diff
==============================================================================
--- vmkit/branches/multi-vm/lib/Mvm/Runtime/VMKit.cpp (original)
+++ vmkit/branches/multi-vm/lib/Mvm/Runtime/VMKit.cpp Sun Dec  5 07:56:37 2010
@@ -32,7 +32,7 @@
 	if(cur) {
 		do {
 			cur->reallocAllVmsData(res, numberOfVms);
-			cur = (Thread*)cur->next();
+			cur = cur->next0();
 		} while(cur!=oneThread);
 	}
 
@@ -59,7 +59,7 @@
 void VMKit::removeThread(mvm::Thread* th) {
 	vmkitLock.lock();
 	numberOfThreads--;
-	if (oneThread == th) oneThread = (Thread*)th->next();
+	if (oneThread == th) oneThread = th->next0();
 	th->remove();
 	if (!numberOfThreads) oneThread = 0;
 	delete th->allVmsData;

Modified: vmkit/branches/multi-vm/mmtk/mmtk-j3/ActivePlan.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/mmtk/mmtk-j3/ActivePlan.cpp?rev=120938&r1=120937&r2=120938&view=diff
==============================================================================
--- vmkit/branches/multi-vm/mmtk/mmtk-j3/ActivePlan.cpp (original)
+++ vmkit/branches/multi-vm/mmtk/mmtk-j3/ActivePlan.cpp Sun Dec  5 07:56:37 2010
@@ -20,11 +20,11 @@
   
   if (A->current == NULL) {
     A->current = (mvm::MutatorThread*)mvm::Thread::get()->vmkit()->oneThread;
-  } else if (A->current->next() == mvm::Thread::get()->vmkit()->oneThread) {
+  } else if (A->current->next0() == mvm::Thread::get()->vmkit()->oneThread) {
     A->current = NULL;
     return NULL;
   } else {
-    A->current = (mvm::MutatorThread*)A->current->next();
+    A->current = (mvm::MutatorThread*)A->current->next0();
   }
 
   if (A->current->MutatorContext == 0) {

Modified: vmkit/branches/multi-vm/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/mmtk/mmtk-j3/Scanning.cpp?rev=120938&r1=120937&r2=120938&view=diff
==============================================================================
--- vmkit/branches/multi-vm/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/branches/multi-vm/mmtk/mmtk-j3/Scanning.cpp Sun Dec  5 07:56:37 2010
@@ -22,7 +22,7 @@
   
   do {
     tcur->scanStack(reinterpret_cast<uintptr_t>(TL));
-    tcur = (mvm::Thread*)tcur->next();
+    tcur = tcur->next0();
   } while (tcur != th);
 }
 
@@ -34,7 +34,7 @@
   
   do {
     tcur->tracer(reinterpret_cast<uintptr_t>(TL));
-    tcur = (mvm::Thread*)tcur->next();
+    tcur = tcur->next0();
   } while (tcur != th);
 }