X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.cc;h=14bb809dabddb051358e27776a0896ef978c62a5;hp=3363f7f4622bdd3de10baffc7c058692cbb8ac95;hb=db2c4ca161b4cba9e453431517af86798c0e9bdb;hpb=0afac4a7183b60920f562ebe26ce49d29114645c

diff --git a/clockvector.cc b/clockvector.cc
index 3363f7f4..14bb809d 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
@@ -44,6 +43,8 @@ void ClockVector::merge(const ClockVector *cv)
 
 	if (cv->num_threads > num_threads) {
 		clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
+		for (int i = num_threads; i < cv->num_threads; i++)
+			clock[i] = 0;
 		num_threads = cv->num_threads;
 	}
 
@@ -74,17 +75,6 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
 	return false;
 }
 
-bool ClockVector::has_synchronized_with(const ClockVector *cv) const
-{
-	ASSERT(cv);
-	if (cv->num_threads > num_threads)
-		return false;
-	for (int i = 0; i < cv->num_threads; i++)
-		if (cv->clock[i] > clock[i])
-			return false;
-	return true;
-}
-
 /** Gets the clock corresponding to a given thread id from the clock vector. */
 modelclock_t ClockVector::getClock(thread_id_t thread) {
 	int threadid = id_to_int(thread);
@@ -99,7 +89,7 @@ modelclock_t ClockVector::getClock(thread_id_t thread) {
 void ClockVector::print() const
 {
 	int i;
-	printf("CV: (");
+	model_print("CV: (");
 	for (i = 0; i < num_threads; i++)
-		printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+		model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }