X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=clockvector.h;h=6a902c5215342bae0313d56b3e6cfa8267bd79cf;hp=b7d720688a1c6df4a9aad410e1eb4897b08d35ff;hb=fe7b400edb33255770fb47ad520afbd05d13a231;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a

diff --git a/clockvector.h b/clockvector.h
index b7d7206..6a902c5 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,15 +15,17 @@ class ClockVector {
 public:
 	ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
 	~ClockVector();
-	void merge(ClockVector *cv);
-	bool synchronized_since(ModelAction *act) const;
+	void merge(const ClockVector *cv);
+	bool synchronized_since(const ModelAction *act) const;
+	bool has_synchronized_with(const ClockVector *cv) const;
 
 	void print() const;
+	modelclock_t getClock(thread_id_t thread);
 
-	MEMALLOC
+	SNAPSHOTALLOC
 private:
 	/** @brief Holds the actual clock data, as an array. */
-	int *clock;
+	modelclock_t *clock;
 
 	/** @brief The number of threads recorded in clock (i.e., its length).  */
 	int num_threads;