X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.cc;h=9820b8f986b8ba93c465674212d2967e1104fd96;hp=da459d0e0faf461aab67af55ab7f3338082fdd9d;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=5f6fdf806a3389a8318011023ccc6f45389624af

diff --git a/clockvector.cc b/clockvector.cc
index da459d0e..9820b8f9 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,61 +1,129 @@
-#include <algorithm>
 #include <cstring>
+#include <stdlib.h>
 
-#include "model.h"
 #include "action.h"
+
 #include "clockvector.h"
 #include "common.h"
+#include "threads-model.h"
+
 
-ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
+/**
+ * Constructs a new ClockVector, given a parent ClockVector and a first
+ * ModelAction. This constructor can assign appropriate default settings if no
+ * parent and/or action is supplied.
+ * @param parent is the previous ClockVector to inherit (i.e., clock from the
+ * same thread or the parent that created this thread)
+ * @param act is an action with which to update the ClockVector
+ */
+ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
 {
-	num_threads = parent ? parent->num_threads : 1;
-	if (act && act->get_type() == THREAD_CREATE)
-		num_threads++;
-	clock = (int *)MYMALLOC(num_threads * sizeof(int));
+	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(int));
-	else
-		clock[0] = 0;
+		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();
 }
 
+/** @brief Destructor */
 ClockVector::~ClockVector()
 {
-	MYFREE(clock);
+	snapshot_free(clock);
 }
 
-void ClockVector::merge(ClockVector *cv)
+/**
+ * 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::merge(const ClockVector *cv)
 {
-	int *clk = clock;
-	bool resize = false;
-
 	ASSERT(cv != NULL);
-
+	bool changed = false;
 	if (cv->num_threads > num_threads) {
-		resize = true;
-		clk = (int *)MYMALLOC(cv->num_threads * sizeof(int));
+		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 < num_threads; i++)
-		clk[i] = std::max(clock[i], cv->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;
+}
 
-	if (resize) {
-		for (int i = num_threads; i < cv->num_threads; i++)
-			clk[i] = cv->clock[i];
+/**
+ * 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;
-		MYFREE(clock);
 	}
-	clock = clk;
+
+	/* 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;
 }
 
-bool ClockVector::happens_before(ModelAction *act, thread_id_t id)
+/**
+ * Check whether this vector's thread has synchronized with another action's
+ * thread. This effectively checks the happens-before relation (or actually,
+ * happens after), but it's easier to compare two ModelAction events directly,
+ * using ModelAction::happens_before.
+ *
+ * @see ModelAction::happens_before
+ *
+ * @return true if this ClockVector's thread has synchronized with act's
+ * thread, false otherwise. That is, this function returns:
+ * <BR><CODE>act <= cv[act->tid]</CODE>
+ */
+bool ClockVector::synchronized_since(const ModelAction *act) const
 {
-	int i = id_to_int(id);
+	int i = id_to_int(act->get_tid());
 
 	if (i < num_threads)
-		return act->get_seq_number() < clock[i];
+		return act->get_seq_number() <= clock[i];
 	return false;
 }
+
+/** 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);
+
+	if (threadid < num_threads)
+		return clock[threadid];
+	else
+		return 0;
+}
+
+/** @brief Formats and prints this ClockVector's data. */
+void ClockVector::print() const
+{
+	int i;
+	model_print("(");
+	for (i = 0;i < num_threads;i++)
+		model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+}