model, nodestack: bugfix - retain UNINIT actions across executions

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index fc566d6dde8fd65561888899c3505babd79804b0..8ad329eeaf04f09eb4037c6d9dc6931e8cc1524a 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -29,6 +29,13 @@ typedef enum {
        READ_FROM_NONE,
 } read_from_type_t;
 
+#define YIELD_E 1
+#define YIELD_D 2
+#define YIELD_S 4
+#define YIELD_P 8
+#define YIELD_INDEX(tid1, tid2, num_threads) (tid1*num_threads+tid2)
+
+
 /**
  * @brief A single node in a NodeStack
  *
@@ -57,7 +64,12 @@ public:
        enabled_type_t enabled_status(thread_id_t tid) const;
 
        ModelAction * get_action() const { return action; }
+       void set_uninit_action(ModelAction *act) { uninit_action = act; }
+       ModelAction * get_uninit_action() const { return uninit_action; }
+
        bool has_priority(thread_id_t tid) const;
+       void update_yield(Scheduler *);
+       bool has_priority_over(thread_id_t tid, thread_id_t tid2) const;
        int get_num_threads() const { return num_threads; }
        /** @return the parent Node to this Node; that is, the action that
         * occurred previously in the stack. */
@@ -75,7 +87,9 @@ public:
        int get_read_from_past_size() const;
 
        void add_read_from_promise(const ModelAction *reader);
-       const Promise * get_read_from_promise() const;
+       Promise * get_read_from_promise() const;
+       Promise * get_read_from_promise(int i) const;
+       int get_read_from_promise_size() const;
 
        bool add_future_value(struct future_value fv);
        struct future_value get_future_value() const;
@@ -103,7 +117,7 @@ public:
        MEMALLOC
 private:
        void explore(thread_id_t tid);
-
+       int get_yield_data(int tid1, int tid2) const;
        bool read_from_past_empty() const;
        bool increment_read_from_past();
        bool read_from_promise_empty() const;
@@ -113,6 +127,10 @@ private:
        read_from_type_t read_from_status;
 
        ModelAction * const action;
+
+       /** @brief ATOMIC_UNINIT action which was created at this Node */
+       ModelAction *uninit_action;
+
        Node * const parent;
        const int num_threads;
        std::vector< bool, ModelAlloc<bool> > explored_children;
@@ -142,6 +160,7 @@ private:
 
        int misc_index;
        int misc_max;
+       int * yield_data;
 };
 
 typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;