X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=74cb4e1f29aaf2c649fce027fc9dd10c714eb562;hb=1f2a30ddc8f38f3f45d62d169b766c0c38364ecd;hp=4dbe557222c40a0a7d92fb55227a202d54f069f6;hpb=144f1b806679fd9030147f554513d7fce36f65dc;p=model-checker.git

diff --git a/model.h b/model.h
index 4dbe557..74cb4e1 100644
--- a/model.h
+++ b/model.h
@@ -50,33 +50,26 @@ public:
 	/** @returns the context for the main model-checking system thread */
 	ucontext_t * get_system_context() { return &system_context; }
 
-	const ModelExecution * get_execution() const { return execution; }
+	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;
 
-	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);
-	ModelAction * get_last_action(thread_id_t tid) const;
-
 	MEMALLOC
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
@@ -84,6 +77,10 @@ private:
 	NodeStack * const node_stack;
 	ModelExecution *execution;
 
+	int execution_number;
+
+	unsigned int get_num_threads() const;
+
 	void execute_sleep_set();
 
 	bool next_execution();
@@ -98,7 +95,7 @@ private:
 
 	ucontext_t system_context;
 
-	ModelVector<TraceAnalysis *> * trace_analyses;
+	ModelVector<TraceAnalysis *> trace_analyses;
 
 	/** @brief The cumulative execution stats */
 	struct execution_stats stats;