pull in most of atomic header file

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 3e4480419c03941413307ebba6a6e27a77372109..e43955dda2826d980f632bf62af4e08397594d45 100644 (file)
--- a/action.h
+++ b/action.h
@@ -9,11 +9,14 @@
 #include <cstddef>
 
 #include "threads.h"
-#include "libatomic.h"
 #include "mymemory.h"
 #include "clockvector.h"
+#include "libatomic.h"
+
+/** Note that this value can be legitimately used by a program, and
+               hence by iteself does not indicate no value. */
 
-#define VALUE_NONE -1
+#define VALUE_NONE 1234567890
 
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
@@ -38,7 +41,7 @@ class ClockVector;
  */
 class ModelAction {
 public:
-       ModelAction(action_type_t type, memory_order order, void *loc, int value = VALUE_NONE);
+       ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE);
        ~ModelAction();
        void print(void) const;
 
@@ -47,11 +50,11 @@ public:
        memory_order get_mo() const { return order; }
        void * get_location() const { return location; }
        modelclock_t get_seq_number() const { return seq_number; }
-       int get_value() const { return value; }
+       uint64_t get_value() const { return value; }
+       const ModelAction * get_reads_from() const { return reads_from; }
 
        Node * get_node() const { return node; }
        void set_node(Node *n) { node = n; }
-       void set_value(int val) { value = val; }
 
        bool is_read() const;
        bool is_write() const;
@@ -77,6 +80,8 @@ public:
                return get_seq_number() > act.get_seq_number();
        }
 
+       void upgrade_rmw(ModelAction * act);
+
        MEMALLOC
 private:
 
@@ -92,9 +97,11 @@ private:
        /** The thread id that performed this action. */
        thread_id_t tid;
 
-       /** The value read or written (if RMW, then the value written). This
-        * should probably be something longer. */
-       int value;
+       /** The value written (for write or RMW; undefined for read) */
+       uint64_t value;
+
+       /** The action that this action reads from. Only valid for reads */
+       const ModelAction *reads_from;
 
        /** A back reference to a Node in NodeStack, if this ModelAction is
         * saved on the NodeStack. */