X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=5f068e9025fffe3667a508196c155defa9421bbd;hb=130a35155171503883aaf18e57f8957ce63d06e8;hp=2b6a4cc6822c6f202decc866c0d25956908dff85;hpb=f4d77c40b4029cdc18f4aaa5a4e01dfbcfca5f7b;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 2b6a4cc..5f068e9 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,12 +1,10 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
-#include "model.h"
 #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
@@ -18,13 +16,16 @@
  */
 ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 {
-	num_threads = model->get_num_threads();
+	ASSERT(act);
+	num_threads = int_to_id(act->get_tid()) + 1;
+	if (parent && parent->num_threads > num_threads)
+		num_threads = parent->num_threads;
+
 	clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
 	if (parent)
 		std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
-	if (act)
-		clock[id_to_int(act->get_tid())] = act->get_seq_number();
+	clock[id_to_int(act->get_tid())] = act->get_seq_number();
 }
 
 /** @brief Destructor */
@@ -38,29 +39,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)
 {
-	modelclock_t *clk = clock;
-	bool resize = false;
-
 	ASSERT(cv != NULL);
-
+	bool changed = false;
 	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];
+			changed = true;
+		}
+	
+	return changed;
 }
 
 /**
@@ -84,17 +81,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 +95,7 @@ modelclock_t ClockVector::getClock(thread_id_t thread) {
 void ClockVector::print() const
 {
 	int i;
-	printf("CV: (");
+	model_print("(");
 	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" : ", ");
 }