X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=ba5d1f4b2e627a76e41a8e40589b833fc00dd584;hb=HEAD;hp=467a27e94372de3a00e356f3b5985298e89ff323;hpb=805ebd24556eda8ae7183ee3f518148e86799ac1;p=c11tester.git

diff --git a/clockvector.cc b/clockvector.cc
index 467a27e9..ba5d1f4b 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -16,18 +16,18 @@
  * 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)
 {
-	ASSERT(act);
-	num_threads = int_to_id(act->get_tid()) + 1;
+	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));
+		real_memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
-	clock[id_to_int(act->get_tid())] = act->get_seq_number();
+	if (act != NULL)
+		clock[id_to_int(act->get_tid())] = act->get_seq_number();
 }
 
 /** @brief Destructor */
@@ -47,18 +47,44 @@ bool ClockVector::merge(const ClockVector *cv)
 	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++)
+	for (int i = 0;i < cv->num_threads;i++)
 		if (cv->clock[i] > clock[i]) {
 			clock[i] = cv->clock[i];
 			changed = true;
 		}
-	
+
+	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 minimum */
+	for (int i = 0;i < cv->num_threads;i++)
+		if (cv->clock[i] < clock[i]) {
+			clock[i] = cv->clock[i];
+			changed = true;
+		}
+
 	return changed;
 }
 
@@ -98,6 +124,6 @@ void ClockVector::print() const
 {
 	int i;
 	model_print("(");
-	for (i = 0; i < num_threads; i++)
+	for (i = 0;i < num_threads;i++)
 		model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }