towards supporting scanalysis...

[c11tester.git] / clockvector.h

diff --git a/clockvector.h b/clockvector.h
index d233cdd136c46f7e00c547f9ac1d4be95d62cdee..e19a2113a5e10f9860669656bb1583ec91da3620 100644 (file)
--- 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 synchronized_since(ModelAction *act);
+       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;
 };