clockvector: fixup initialization

[cdsspec-compiler.git] / action.h

diff --git a/action.h b/action.h
index 4cc68479e347e5e50573b074ef625e1d013b73f5..62141749d5efafc34dc1bbe3fef6656b344571ec 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,6 +2,8 @@
 #define __ACTION_H__
 
 #include <list>
+#include <cstddef>
+
 #include "threads.h"
 #include "libatomic.h"
 #include "mymemory.h"
@@ -17,10 +19,12 @@ typedef enum action_type {
 
 /* Forward declaration */
 class Node;
+class ClockVector;
 
 class ModelAction {
 public:
        ModelAction(action_type_t type, memory_order order, void *loc, int value);
+       ~ModelAction();
        void print(void);
 
        thread_id_t get_tid() { return tid; }
@@ -40,13 +44,17 @@ public:
        bool same_thread(ModelAction *act);
        bool is_dependent(ModelAction *act);
 
+       void create_cv(ModelAction *parent = NULL);
+       void read_from(ModelAction *act);
+
        inline bool operator <(const ModelAction& act) const {
                return get_seq_number() < act.get_seq_number();
        }
        inline bool operator >(const ModelAction& act) const {
                return get_seq_number() > act.get_seq_number();
        }
-  MEMALLOC
+
+       MEMALLOC
 private:
        action_type type;
        memory_order order;
@@ -55,8 +63,10 @@ private:
        int value;
        Node *node;
        int seq_number;
+
+       ClockVector *cv;
 };
 
-typedef std::list<class ModelAction *, MyAlloc< class ModelAction * > > action_list_t;
+typedef std::list<class ModelAction *> action_list_t;
 
 #endif /* __ACTION_H__ */