Adding STL stuff and operator news of snapshot to model-checker. Need to actuallly...

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index f9f0c41762d72c03cfd57c2f4b2b420e1d242462..c069cab3a3c5c3a7e6804498a2f6262b753a6f20 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,11 +2,9 @@
 #define __ACTION_H__
 
 #include <list>
-
-#include "libthreads.h"
-#include "libatomic.h"
 #include "threads.h"
-
+#include "libatomic.h"
+#include "mymemory.h"
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -17,7 +15,7 @@ typedef enum action_type {
        ATOMIC_WRITE
 } action_type_t;
 
-/* Forward declaration (tree.h) */
+/* Forward declaration */
 class TreeNode;
 
 class ModelAction {
@@ -29,6 +27,7 @@ public:
        action_type get_type() { return type; }
        memory_order get_mo() { return order; }
        void * get_location() { return location; }
+       int get_seq_number() { return seq_number; }
 
        TreeNode * get_node() { return node; }
        void set_node(TreeNode *n) { node = n; }
@@ -40,6 +39,7 @@ public:
        bool same_var(ModelAction *act);
        bool same_thread(ModelAction *act);
        bool is_dependent(ModelAction *act);
+  MEMALLOC
 private:
        action_type type;
        memory_order order;
@@ -47,8 +47,9 @@ private:
        thread_id_t tid;
        int value;
        TreeNode *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__ */