pull in most of atomic header file

[model-checker.git] / action.h

diff --git a/action.h b/action.h
index 731c3192f747b083bc0f26e6b0961c432bc90514..e43955dda2826d980f632bf62af4e08397594d45 100644 (file)
--- a/action.h
+++ b/action.h
@@ -9,16 +9,20 @@
 #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 */
 typedef enum action_type {
        THREAD_CREATE,        /**< A thread creation action */
+       THREAD_START,         /**< First action in each thread */
        THREAD_YIELD,         /**< A thread yield action */
        THREAD_JOIN,          /**< A thread join action */
        ATOMIC_READ,          /**< An atomic read action */
@@ -37,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;
 
@@ -46,7 +50,7 @@ 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; }
@@ -76,6 +80,8 @@ public:
                return get_seq_number() > act.get_seq_number();
        }
 
+       void upgrade_rmw(ModelAction * act);
+
        MEMALLOC
 private:
 
@@ -90,10 +96,9 @@ 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;
@@ -101,7 +106,7 @@ private:
        /** A back reference to a Node in NodeStack, if this ModelAction is
         * saved on the NodeStack. */
        Node *node;
-       
+
        modelclock_t seq_number;
 
        /** The clock vector stored with this action; only needed if this