X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=0945bcf751dcd7eca5de6159affea9db49c58e3f;hb=d21164220a0d87ae931bf50d0e97ebf838742659;hp=4dd03dc26fb7291a59ed4d1304358948bff6e062;hpb=cabbdfb6fe631a0e4b1bfd1cb73862da6f04d7d8;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 4dd03dc..0945bcf 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
@@ -38,21 +37,25 @@ ClockVector::~ClockVector()
  * resulting vector length will be the maximum length of the two being merged.
  * @param cv is the ClockVector being merged into this vector.
  */
-void ClockVector::merge(const ClockVector *cv)
+bool ClockVector::merge(const ClockVector *cv)
 {
 	ASSERT(cv != NULL);
-
+	bool changed = false;
 	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++)
+		for (int i = num_threads; i < cv->num_threads; i++)
 			clock[i] = 0;
 		num_threads = cv->num_threads;
 	}
 
 	/* Element-wise maximum */
 	for (int i = 0; i < cv->num_threads; i++)
-		if (cv->clock[i] > clock[i])
+		if (cv->clock[i] > clock[i]) {
 			clock[i] = cv->clock[i];
+			changed = true;
+		}
+	
+	return changed;
 }
 
 /**
@@ -76,17 +79,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);
@@ -101,7 +93,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" : ", ");
 }