fix one segfault bug...something is still strange, but has to do with stack

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index cfe1f34eece13b4600f6de66393a872c7540e33a..005e65842e7353f9ca0dc50846eddf9bf054a111 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,10 +2,9 @@
 #define __ACTION_H__
 
 #include <list>
-
 #include "threads.h"
 #include "libatomic.h"
-
+#include "mymemory.h"
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -17,7 +16,6 @@ typedef enum action_type {
 } action_type_t;
 
 /* Forward declaration */
-class TreeNode;
 class Node;
 
 class ModelAction {
@@ -31,8 +29,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; }
 
@@ -50,17 +46,18 @@ public:
        inline bool operator >(const ModelAction& act) const {
                return get_seq_number() > act.get_seq_number();
        }
+
+       MEMALLOC
 private:
        action_type type;
        memory_order order;
        void *location;
        thread_id_t tid;
        int value;
-       TreeNode *treenode;
        Node *node;
        int seq_number;
 };
 
-typedef std::list<class ModelAction *> action_list_t;
+typedef std::list<class ModelAction *, MyAlloc< class ModelAction * > > action_list_t;
 
 #endif /* __ACTION_H__ */