X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.h;h=739a336e1adc6c81178686c10da60d411cd903b8;hb=0ebd310446ea2a5675ee33eb6f9d75e311af7d36;hp=470914b1ae2b08b19248b5aba29142c990232b4f;hpb=9b784333e1a62ed6d258e96502a5733041389c8f;p=model-checker.git

diff --git a/clockvector.h b/clockvector.h
index 470914b..739a336 100644
--- a/clockvector.h
+++ b/clockvector.h
@@ -8,6 +8,7 @@
 #include "threads.h"
 #include "mymemory.h"
 
+typedef unsigned int modelclock_t;
 /* Forward declaration */
 class ModelAction;
 
@@ -15,16 +16,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;
-	int getClock(thread_id_t thread);
+	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;