X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=clockvector.h;h=1a36a39dc040838f2c37b8166a8faf9b9a6a80fd;hp=615dfeb7e83196dff11213ed589ceaaadc7b2196;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=810306cb85accaaace9a50f174264f105991230b

diff --git a/clockvector.h b/clockvector.h
index 615dfeb7..1a36a39d 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -1,20 +1,32 @@
+/** @file clockvector.h
+ *  @brief Implements a clock vector.
+ */
+
 #ifndef __CLOCKVECTOR_H__
 #define __CLOCKVECTOR_H__
 
-#include "threads.h"
-
-/* Forward declaration */
-class ModelAction;
+#include "mymemory.h"
+#include "modeltypes.h"
+#include "classlist.h"
 
 class ClockVector {
 public:
-	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+	ClockVector(ClockVector *parent = NULL, const ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
-	bool happens_before(ModelAction *act, thread_id_t id);
+	bool merge(const ClockVector *cv);
+	bool minmerge(const ClockVector *cv);
+	bool synchronized_since(const ModelAction *act) const;
+
+	void print() const;
+	modelclock_t getClock(thread_id_t thread);
+
+	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;
 };
 
-#endif /* __CLOCKVECTOR_H__ */
+#endif	/* __CLOCKVECTOR_H__ */