[vmkit-commits] [vmkit] r180537 - Commenting debug messages

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:21:17 2013
New Revision: 180537

URL: http://llvm.org/viewvc/llvm-project?rev=180537&view=rev
Log:
Commenting debug messages
(cherry picked from commit f0ccdacbb0dd68d9c9a72c3890c0ecbba13f3cde)

Modified:
    vmkit/trunk/lib/vmkit/CommonThread/CollectionRV.cpp
    vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp

Modified: vmkit/trunk/lib/vmkit/CommonThread/CollectionRV.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/CollectionRV.cpp?rev=180537&r1=180536&r2=180537&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/CollectionRV.cpp (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/CollectionRV.cpp Thu Apr 25 12:21:17 2013
@@ -41,18 +41,18 @@ void CollectionRV::waitRV() {
   // Add myself.
   nbJoined++;
 
-  fprintf(stderr, "waitRV: %d from %d\n", nbJoined, self->MyVM->numberOfThreads);
+  //fprintf(stderr, "waitRV: %d from %d\n", nbJoined, self->MyVM->numberOfThreads);
 
   while (nbJoined != self->MyVM->numberOfThreads) {
 	  vmkit::Thread* cur = self;
-	  fprintf(stderr, "Wasting time : ");
+	  //fprintf(stderr, "Wasting time : ");
 	    for (cur = (vmkit::Thread*)self->next(); cur != self;
 	         cur = (vmkit::Thread*)cur->next()) {
-	      if (!cur->getLastSP() && cur != self) {
-	        fprintf(stderr, "%p,", cur);
-	      }
+//	      if (!cur->getLastSP() && cur != self) {
+//	        fprintf(stderr, "%p,", cur);
+//	      }
 	    }
-	    fprintf(stderr, "\n");
+//	    fprintf(stderr, "\n");
     condInitiator.wait(&_lockRV);
   } 
 }
@@ -85,7 +85,7 @@ void CooperativeCollectionRV::synchroniz
     }
   }
   
-  fprintf(stderr, "synchronize: %d from %d\n", nbJoined, self->MyVM->numberOfThreads);
+//  fprintf(stderr, "synchronize: %d from %d\n", nbJoined, self->MyVM->numberOfThreads);
 
   // And wait for other threads to finish.
   waitRV();

Modified: vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp?rev=180537&r1=180536&r2=180537&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/vmkit/CommonThread/ctthread.cpp Thu Apr 25 12:21:17 2013
@@ -161,10 +161,13 @@ StackWalker::StackWalker(vmkit::Thread*
   } else {
     addr = th->waitOnSP();
     if (frame) {
-    	if (frame->currentFP < addr) {
-    		fprintf(stderr, "Error in thread with pointer %p because %x < %x\n", th, frame->currentFP, addr);
-    	}
-      assert(frame->currentFP >= addr);
+//    	if (frame->currentFP < addr) {
+//    		fprintf(stderr, "Error in thread with pointer %p because %x < %x\n", th, frame->currentFP, addr);
+//    		addr = frame->currentFP;
+//    	}
+
+
+    	assert(frame->currentFP >= addr);
     }
     if (frame && (addr == frame->currentFP)) {
       frame = frame->previousFrame;
@@ -195,7 +198,8 @@ void Thread::enterUncooperativeCode(uint
       word_t temp = System::GetCallerAddress();
       // Make sure to at least get the caller of the caller.
       ++level;
-      while (level--) temp = System::GetCallerOfAddress(temp);
+      while (level--)
+    	  temp = System::GetCallerOfAddress(temp);
       // The cas is not necessary, but it does a memory barrier.
       __sync_bool_compare_and_swap(&lastSP, 0, temp);
       if (doYield) joinRVBeforeEnter();
@@ -366,7 +370,7 @@ void Thread::internalThreadStart(vmkit::
   //sigaction(SIGTERM, &sa, NULL);
 
   assert(th->MyVM && "VM not set in a thread");
-  fprintf(stderr, "Thread %p has TID %ld\n", th,syscall(SYS_gettid) );
+//  fprintf(stderr, "Thread %p has TID %ld\n", th,syscall(SYS_gettid) );
   th->MyVM->rendezvous.addThread(th);
   th->routine(th);
   th->MyVM->removeThread(th);