X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=2ef8b03d9e36e22ce4ee6989ec31d20633717ed2;hb=f3ef22bef8d339c7d45b7d7232cdcf183a0b7776;hp=da459d0e0faf461aab67af55ab7f3338082fdd9d;hpb=10de861d3a9908e75b6f94283cc67b3f1b4d93ab;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index da459d0..2ef8b03 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <cstring>
+#include <stdlib.h>
 
 #include "model.h"
 #include "action.h"
@@ -8,14 +9,11 @@
 
 ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 {
-	num_threads = parent ? parent->num_threads : 1;
-	if (act && act->get_type() == THREAD_CREATE)
-		num_threads++;
+	num_threads = model->get_num_threads();
 	clock = (int *)MYMALLOC(num_threads * sizeof(int));
+	memset(clock, 0, num_threads * sizeof(int));
 	if (parent)
 		std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
-	else
-		clock[0] = 0;
 
 	if (act)
 		clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@ -51,11 +49,25 @@ void ClockVector::merge(ClockVector *cv)
 	clock = clk;
 }
 
-bool ClockVector::happens_before(ModelAction *act, thread_id_t id)
+/**
+ *
+ * @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(ModelAction *act)
 {
-	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;
 }
+
+void ClockVector::print()
+{
+	int i;
+	printf("CV: (");
+	for (i = 0; i < num_threads; i++)
+		printf("%2d%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+}