commit stuff before merge

[c11tester.git] / action.h

diff --git a/action.h b/action.h
index 5e8b1b1c7691c75e212bdbaa0daed6b00723b32e..5862485b7e54b58a70ac10e0800be70f23548c33 100644 (file)
--- a/action.h
+++ b/action.h
@@ -106,9 +106,6 @@ public:
        ModelAction * get_reads_from() const { return reads_from; }
        cdsc::mutex * get_mutex() const;
 
-       Node * get_node() const;
-       void set_node(Node *n) { node = n; }
-
        void set_read_from(ModelAction *act);
 
        /** Store the most recent fence-release from the same thread
@@ -179,6 +176,8 @@ public:
        /* to accomodate pthread create and join */
        Thread * thread_operand;
        void set_thread_operand(Thread *th) { thread_operand = th; }
+       void set_uninit_action(ModelAction *act) { uninitaction = act; }
+       ModelAction * get_uninit_action() { return uninitaction; }
        SNAPSHOTALLOC
 private:
        const char * get_type_str() const;
@@ -202,14 +201,7 @@ private:
 
        /** @brief The last fence release from the same thread */
        const ModelAction *last_fence_release;
-
-       /**
-        * @brief A back reference to a Node in NodeStack
-        *
-        * Only set if this ModelAction is saved on the NodeStack. (A
-        * ModelAction can be thrown away before it ever enters the NodeStack.)
-        */
-       Node *node;
+       ModelAction * uninitaction;
 
        /**
         * @brief The clock vector for this operation