switch to snapshot/modelalloc versions of stl classes

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 0a9422572eb0c4bd3ae6ce18b96757c57281a29f..47c0272f95fa917e8710235fa0d56b02194a4d08 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,7 +5,7 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <vector>
+#include "stl_wrappers.h"
 #include <cstddef>
 #include <inttypes.h>
 
@@ -64,6 +64,9 @@ 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;
@@ -124,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;
@@ -156,7 +163,7 @@ private:
        int * yield_data;
 };
 
-typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
+typedef model_vector< Node * > node_list_t;
 
 /**
  * @brief A stack of nodes