execution: embed obj_map directly in class

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index dd5df93b0d9466747330160bd9437b569529bd90..89d089d1051aafbcd95ae6cd4961c23f764be739 100644 (file)
--- a/model.h
+++ b/model.h
@@ -52,27 +52,26 @@ public:
 
        const ModelExecution * get_execution() const { return execution; }
 
+       int get_execution_number() const { return execution_number; }
+
        Thread * get_thread(thread_id_t tid) const;
        Thread * get_thread(const ModelAction *act) const;
-       int get_promise_number(const Promise *promise) const;
 
        bool is_enabled(Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
 
-       thread_id_t get_next_id();
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
        void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
-       void check_promises_thread_disabled();
 
        bool assert_bug(const char *msg, ...);
        void assert_user_bug(const char *msg);
 
        const model_params params;
        void add_trace_analysis(TraceAnalysis *a) {
-               trace_analyses->push_back(a);
+               trace_analyses.push_back(a);
        }
 
        action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
@@ -85,6 +84,8 @@ private:
        NodeStack * const node_stack;
        ModelExecution *execution;
 
+       int execution_number;
+
        void execute_sleep_set();
 
        bool next_execution();
@@ -99,7 +100,7 @@ private:
 
        ucontext_t system_context;
 
-       ModelVector<TraceAnalysis *> * trace_analyses;
+       ModelVector<TraceAnalysis *> trace_analyses;
 
        /** @brief The cumulative execution stats */
        struct execution_stats stats;