X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=fd65c0503b0ecd32ff16536a601a12c5fb9fab68;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hp=882ca069b32a9d8d7903805bba0986daa96d9f3e;hpb=286195618e981ea2b31036bc4f403382a2dd4835;p=c11tester.git

diff --git a/model.h b/model.h
index 882ca069..fd65c050 100644
--- a/model.h
+++ b/model.h
@@ -16,8 +16,7 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
-
-typedef SnapList<ModelAction *> action_list_t;
+#include "snapshot-interface.h"
 
 /** @brief Model checker execution stats */
 struct execution_stats {
@@ -32,17 +31,10 @@ public:
 	ModelChecker();
 	~ModelChecker();
 	model_params * getParams();
-	void run();
-
-	/** Restart the model checker, intended for pluggins. */
-	void restart();
 
 	/** Exit the model checker, intended for pluggins. */
 	void exit_model_checker();
 
-	/** @returns the context for the main model-checking system thread */
-	ucontext_t * get_system_context() { return &system_context; }
-
 	ModelExecution * get_execution() const { return execution; }
 	ModelHistory * get_history() const { return history; }
 
@@ -52,9 +44,9 @@ public:
 	Thread * get_thread(const ModelAction *act) const;
 
 	Thread * get_current_thread() const;
+	thread_id_t get_current_thread_id() const;
 
-	void switch_from_master(Thread *thread);
-	uint64_t switch_to_master(ModelAction *act);
+	uint64_t switch_thread(ModelAction *act);
 
 	void assert_bug(const char *msg, ...);
 
@@ -63,14 +55,13 @@ public:
 	model_params params;
 	void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
 	void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
-	void startMainThread();
 	void startChecker();
 	Thread * getInitThread() {return init_thread;}
 	Scheduler * getScheduler() {return scheduler;}
 	MEMALLOC
 private:
-	/** Flag indicates whether to restart the model checker. */
-	bool restart_flag;
+	/** Snapshot id we return to restart. */
+	snapshot_id snapshot;
 
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
@@ -80,20 +71,28 @@ private:
 
 	int execution_number;
 
+	unsigned int curr_thread_num;
+	Thread * chosen_thread;
+	bool break_execution;
+
+	void startRunExecution(Thread *old);
+	void finishRunExecution(Thread *old);
+	Thread * getNextThread(Thread *old);
+	bool handleChosenThread(Thread *old);
+
+	modelclock_t checkfree;
+
 	unsigned int get_num_threads() const;
 
-	bool next_execution();
+	void finish_execution(bool moreexecutions);
 	bool should_terminate_execution();
 
 	Thread * get_next_thread();
 	void reset_to_initial_state();
 
-	ucontext_t system_context;
-
 	ModelVector<TraceAnalysis *> trace_analyses;
+	char random_state[256];
 
-	/** @bref Implement restart. */
-	void do_restart();
 	/** @bref Plugin that can inspect new actions. */
 	TraceAnalysis *inspect_plugin;
 	/** @brief The cumulative execution stats */