X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.cc;h=5e25e00f1ac625fc0c116b563dd83ffd4040d296;hp=740b5cf2793de217eea47342e5a785537d016362;hb=8ad3c5f93f32470fc5ddc53ba3402733cf22495b;hpb=a09a4346390cc28a29428ee5a0610b1054aa48ed

diff --git a/clockvector.cc b/clockvector.cc
index 740b5cf2..5e25e00f 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,13 +1,13 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
-#include "model.h"
 #include "action.h"
+
 #include "clockvector.h"
 #include "common.h"
 #include "threads-model.h"
 
+
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
  * ModelAction. This constructor can assign appropriate default settings if no
@@ -16,14 +16,17 @@
  * same thread or the parent that created this thread)
  * @param act is an action with which to update the ClockVector
  */
-ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
+ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
 {
-	num_threads = model->get_num_threads();
+	num_threads = act != NULL ? int_to_id(act->get_tid()) + 1 : 0;
+	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)
+	if (act != NULL)
 		clock[id_to_int(act->get_tid())] = act->get_seq_number();
 }
 
@@ -38,17 +41,51 @@ 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++)
+			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]) {
+			clock[i] = cv->clock[i];
+			changed = true;
+		}
 
-	if (cv->num_threads > num_threads)
+	return changed;
+}
+
+/**
+ * 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.
+ */
+bool ClockVector::minmerge(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++)
+			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])
+	for (int i = 0;i < cv->num_threads;i++)
+		if (cv->clock[i] < clock[i]) {
 			clock[i] = cv->clock[i];
+			changed = true;
+		}
+
+	return changed;
 }
 
 /**
@@ -72,17 +109,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);
@@ -97,7 +123,7 @@ modelclock_t ClockVector::getClock(thread_id_t thread) {
 void ClockVector::print() const
 {
 	int i;
-	printf("CV: (");
-	for (i = 0; i < num_threads; i++)
-		printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+	model_print("(");
+	for (i = 0;i < num_threads;i++)
+		model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }