hack some stuff towards running on mac... unrelated bugs still..

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 2f856e9dfa9be1363dacd91ac84384a52d93cd07..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"
@@ -16,12 +18,13 @@ typedef enum action_type {
 } action_type_t;
 
 /* Forward declaration */
-class TreeNode;
 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; }
@@ -30,8 +33,6 @@ public:
        void * get_location() { return location; }
        int get_seq_number() const { return seq_number; }
 
-       TreeNode * get_treenode() { return treenode; }
-       void set_node(TreeNode *n) { treenode = n; }
        Node * get_node() { return node; }
        void set_node(Node *n) { node = n; }
 
@@ -43,24 +44,29 @@ 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;
        void *location;
        thread_id_t tid;
        int value;
-       TreeNode *treenode;
        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__ */