switch back to norris style spacing in changed files

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 3eafaa99a9f971fe7111c8a640da32e7954d09c5..2f856e9dfa9be1363dacd91ac84384a52d93cd07 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,10 +2,9 @@
 #define __ACTION_H__
 
 #include <list>
-
-#include "libthreads.h"
+#include "threads.h"
 #include "libatomic.h"
-
+#include "mymemory.h"
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -16,8 +15,9 @@ typedef enum action_type {
        ATOMIC_WRITE
 } action_type_t;
 
-/* Forward declaration (tree.h) */
+/* Forward declaration */
 class TreeNode;
+class Node;
 
 class ModelAction {
 public:
@@ -28,9 +28,12 @@ public:
        action_type get_type() { return type; }
        memory_order get_mo() { return order; }
        void * get_location() { return location; }
+       int get_seq_number() const { return seq_number; }
 
-       TreeNode * get_node() { return node; }
-       void set_node(TreeNode *n) { node = n; }
+       TreeNode * get_treenode() { return treenode; }
+       void set_node(TreeNode *n) { treenode = n; }
+       Node * get_node() { return node; }
+       void set_node(Node *n) { node = n; }
 
        bool is_read();
        bool is_write();
@@ -39,15 +42,25 @@ public:
        bool same_var(ModelAction *act);
        bool same_thread(ModelAction *act);
        bool is_dependent(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
 private:
        action_type type;
        memory_order order;
        void *location;
        thread_id_t tid;
        int value;
-       TreeNode *node;
+       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__ */