X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=77db6aa79569c9611d1e296fa5fa2b4134f6e584;hb=7a9b7a8caeeb77511af68e65361aad90293a926b;hp=cfc652866da765899fa3e6f452b3403fa6bcc03b;hpb=9d9b9121ffed4c7406275da34b055040ea5090a9;p=model-checker.git

diff --git a/model.h b/model.h
index cfc6528..77db6aa 100644
--- a/model.h
+++ b/model.h
@@ -52,13 +52,14 @@ 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;
 
 	bool is_enabled(Thread *t) const;
 	bool is_enabled(thread_id_t tid) const;
 
-	unsigned int get_num_threads() const;
 	Thread * get_current_thread() const;
 
 	void switch_from_master(Thread *thread);
@@ -69,12 +70,9 @@ public:
 
 	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 */
@@ -82,6 +80,10 @@ private:
 	NodeStack * const node_stack;
 	ModelExecution *execution;
 
+	int execution_number;
+
+	unsigned int get_num_threads() const;
+
 	void execute_sleep_set();
 
 	bool next_execution();
@@ -96,7 +98,7 @@ private:
 
 	ucontext_t system_context;
 
-	ModelVector<TraceAnalysis *> * trace_analyses;
+	ModelVector<TraceAnalysis *> trace_analyses;
 
 	/** @brief The cumulative execution stats */
 	struct execution_stats stats;