nodestack: localize the model-checker parameters

[model-checker.git] / execution.h

diff --git a/execution.h b/execution.h
index 12603b2fcb49bcf8555982aa09b02d2756925195..8a2bcfa9402a8b2d9c0153aa743c5fc5554613cf 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -66,6 +66,8 @@ public:
                        NodeStack *node_stack);
        ~ModelExecution();
 
+       const struct model_params * get_params() const { return params; }
+
        Thread * take_step(ModelAction *curr);
        void fixup_release_sequences();
 
@@ -111,7 +113,7 @@ public:
 
        ModelAction * get_next_backtrack();
 
-       action_list_t * get_action_trace() const { return action_trace; }
+       action_list_t * get_action_trace() { return &action_trace; }
 
        SNAPSHOTALLOC
 private:
@@ -185,12 +187,12 @@ private:
 
        ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
-       action_list_t * const action_trace;
-       HashTable<int, Thread *, int> thread_map;
+       action_list_t action_trace;
+       SnapVector<Thread *> thread_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t *, uintptr_t, 4> * const obj_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> obj_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */