add support for docs

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index f9f0c41762d72c03cfd57c2f4b2b420e1d242462..53107ea81762d33ab6a63ef2fa7e69176b379b1c 100644 (file)
--- a/action.h
+++ b/action.h
@@ -2,11 +2,11 @@
 #define __ACTION_H__
 
 #include <list>
+#include <cstddef>
 
-#include "libthreads.h"
-#include "libatomic.h"
 #include "threads.h"
-
+#include "libatomic.h"
+#include "mymemory.h"
 #define VALUE_NONE -1
 
 typedef enum action_type {
@@ -14,24 +14,31 @@ typedef enum action_type {
        THREAD_YIELD,
        THREAD_JOIN,
        ATOMIC_READ,
-       ATOMIC_WRITE
+       ATOMIC_WRITE,
+       ATOMIC_RMW
 } action_type_t;
 
-/* Forward declaration (tree.h) */
-class TreeNode;
+/* Forward declaration */
+class Node;
+class ClockVector;
+/**
+ * The ModelAction class encapsulates an atomic action.
+ */
 
 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; }
        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; }
+       Node * get_node() { return node; }
+       void set_node(Node *n) { node = n; }
 
        bool is_read();
        bool is_write();
@@ -40,13 +47,43 @@ public:
        bool same_var(ModelAction *act);
        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
 private:
+
+       /** Type of action (read, write, thread create, thread yield, thread join) */
        action_type type;
+
+       /** The memory order for this operation. */
        memory_order order;
+
+       /** A pointer to the memory location for this action. */
        void *location;
+
+       /** The thread id that performed this action. */
        thread_id_t tid;
+       
+       /** The value written.  This should probably be something longer. */
        int value;
-       TreeNode *node;
+
+       Node *node;
+       
+       int seq_number;
+
+       /** The clock vector stored with this action if this action is a
+        *  store release */
+
+       ClockVector *cv;
 };
 
 typedef std::list<class ModelAction *> action_list_t;