small changes

[c11tester.git] / clockvector.h

diff --git a/clockvector.h b/clockvector.h
index eb7086253d7f97e79b0f1d1ce41ef7b4e988e561..1a36a39dc040838f2c37b8166a8faf9b9a6a80fd 100644 (file)
--- a/clockvector.h
+++ b/clockvector.h
@@ -1,25 +1,32 @@
+/** @file clockvector.h
+ *  @brief Implements a clock vector.
+ */
+
 #ifndef __CLOCKVECTOR_H__
 #define __CLOCKVECTOR_H__
 
-#include "threads.h"
 #include "mymemory.h"
-
-/* Forward declaration */
-class ModelAction;
+#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();
+       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;
 };
 
-#endif /* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */