X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=clockvector.cc;h=0945bcf751dcd7eca5de6159affea9db49c58e3f;hp=e56c2ace662507be12875c18446932fe54593252;hb=9508fe09d2eeaaf7fbe7193d9cb81b3bc66316b5;hpb=15fabc6f4e6591341940a8087a8dd088af59bb5c

diff --git a/clockvector.cc b/clockvector.cc
index e56c2ac..0945bcf 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -37,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;
 }
 
 /**
@@ -89,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" : ", ");
 }