X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=2b6a4cc6822c6f202decc866c0d25956908dff85;hb=9db4729d3e6ab5f3ec5fd8a2560d95026332fecf;hp=162a7c2550db61c3845885349a01b76e6fd84838;hpb=2db2ef3b8bdabacc7784fd5a4e7e7520f1cd2298;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 162a7c2..2b6a4cc 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -6,6 +6,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
+#include "threads.h"
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
@@ -18,8 +19,7 @@
 ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 {
 	num_threads = model->get_num_threads();
-	clock = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
-	memset(clock, 0, num_threads * sizeof(int));
+	clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
 	if (parent)
 		std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
@@ -30,15 +30,15 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 /** @brief Destructor */
 ClockVector::~ClockVector()
 {
-	MYFREE(clock);
+	snapshot_free(clock);
 }
 
 /**
- * Merge a clock vector into this vector, using a pairwise vector. The
+ * Merge a clock vector into this vector, using a pairwise comparison. The
  * 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(ClockVector *cv)
+void ClockVector::merge(const ClockVector *cv)
 {
 	modelclock_t *clk = clock;
 	bool resize = false;
@@ -47,7 +47,7 @@ void ClockVector::merge(ClockVector *cv)
 
 	if (cv->num_threads > num_threads) {
 		resize = true;
-		clk = (modelclock_t *)MYMALLOC(cv->num_threads * sizeof(modelclock_t));
+		clk = (modelclock_t *)snapshot_malloc(cv->num_threads * sizeof(modelclock_t));
 	}
 
 	/* Element-wise maximum */
@@ -58,7 +58,7 @@ void ClockVector::merge(ClockVector *cv)
 		for (int i = num_threads; i < cv->num_threads; i++)
 			clk[i] = cv->clock[i];
 		num_threads = cv->num_threads;
-		MYFREE(clock);
+		snapshot_free(clock);
 	}
 	clock = clk;
 }
@@ -84,10 +84,18 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
 	return false;
 }
 
-/**
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
+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);