X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=clockvector.cc;h=14bb809dabddb051358e27776a0896ef978c62a5;hp=2b6a4cc6822c6f202decc866c0d25956908dff85;hb=b3b2aa79d695bcef7f7f862aca7d1dffa334b3b8;hpb=81ea453e58cbb85fddff3aa8919dfbc59c3140eb

diff --git a/clockvector.cc b/clockvector.cc
index 2b6a4cc..14bb809 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
@@ -6,7 +5,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
@@ -40,27 +39,19 @@ ClockVector::~ClockVector()
  */
 void ClockVector::merge(const ClockVector *cv)
 {
-	modelclock_t *clk = clock;
-	bool resize = false;
-
 	ASSERT(cv != NULL);
 
 	if (cv->num_threads > num_threads) {
-		resize = true;
-		clk = (modelclock_t *)snapshot_malloc(cv->num_threads * sizeof(modelclock_t));
-	}
-
-	/* Element-wise maximum */
-	for (int i = 0; i < num_threads; i++)
-		clk[i] = std::max(clock[i], cv->clock[i]);
-
-	if (resize) {
+		clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
 		for (int i = num_threads; i < cv->num_threads; i++)
-			clk[i] = cv->clock[i];
+			clock[i] = 0;
 		num_threads = cv->num_threads;
-		snapshot_free(clock);
 	}
-	clock = clk;
+
+	/* Element-wise maximum */
+	for (int i = 0; i < cv->num_threads; i++)
+		if (cv->clock[i] > clock[i])
+			clock[i] = cv->clock[i];
 }
 
 /**
@@ -84,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);
@@ -109,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" : ", ");
 }