X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=e19a2113a5e10f9860669656bb1583ec91da3620;hb=c7a6544c3f19d8c4d71b82871c832a866f8dbb79;hp=e9ffb2bf5c4997452bbddb0f8d650e319ce7f777;hpb=6d7624344faab763eb30f3a6424f51538b7292a5;p=model-checker.git

diff --git a/clockvector.h b/clockvector.h
index e9ffb2b..e19a211 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -5,8 +5,8 @@
 #ifndef __CLOCKVECTOR_H__
 #define __CLOCKVECTOR_H__
 
-#include "threads.h"
 #include "mymemory.h"
+#include "modeltypes.h"
 
 /* Forward declaration */
 class ModelAction;
@@ -15,14 +15,18 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
-	bool happens_before(ModelAction *act, thread_id_t id);
+	bool merge(const ClockVector *cv);
+	bool synchronized_since(const ModelAction *act) const;
 
-	void print();
+	void print() const;
+	modelclock_t getClock(thread_id_t thread);
 
-	MEMALLOC
+	SNAPSHOTALLOC
 private:
-	int *clock;
+	/** @brief Holds the actual clock data, as an array. */
+	modelclock_t *clock;
+
+	/** @brief The number of threads recorded in clock (i.e., its length).  */
 	int num_threads;
 };