X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=model.h;h=634748130ce51713d014c07903f10edf4d3a8fe1;hb=15ea44894415d4b1150728658d65c641556e5fcf;hp=2a505c3d0251064710a85f1b75aca17d912bd23e;hpb=5d0368dd546d03580ae69f8058a3a4fdc31de83b;p=c11tester.git

diff --git a/model.h b/model.h
index 2a505c3d..63474813 100644
--- a/model.h
+++ b/model.h
@@ -16,16 +16,13 @@
 #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 {
 	int num_total;	/**< @brief Total number of executions */
-	int num_infeasible;	/**< @brief Number of infeasible executions */
 	int num_buggy_executions;	/** @brief Number of buggy executions */
 	int num_complete;	/**< @brief Number of feasible, non-buggy, complete executions */
-	int num_redundant;	/**< @brief Number of redundant, aborted executions */
 };
 
 /** @brief The central structure for model-checking */
@@ -33,12 +30,9 @@ class ModelChecker {
 public:
 	ModelChecker();
 	~ModelChecker();
-	void setParams(struct model_params params);
+	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();
 
@@ -46,6 +40,7 @@ public:
 	ucontext_t * get_system_context() { return &system_context; }
 
 	ModelExecution * get_execution() const { return execution; }
+	ModelHistory * get_history() const { return history; }
 
 	int get_execution_number() const { return execution_number; }
 
@@ -57,27 +52,32 @@ public:
 	void switch_from_master(Thread *thread);
 	uint64_t switch_to_master(ModelAction *act);
 
-	bool assert_bug(const char *msg, ...);
+	void assert_bug(const char *msg, ...);
+
 	void assert_user_bug(const char *msg);
 
 	model_params params;
 	void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
 	void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
+	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;
-	NodeStack * const node_stack;
+	ModelHistory * history;
 	ModelExecution *execution;
+	Thread * init_thread;
 
 	int execution_number;
 
 	unsigned int get_num_threads() const;
 
-	bool next_execution();
+	void finish_execution(bool moreexecutions);
 	bool should_terminate_execution();
 
 	Thread * get_next_thread();
@@ -87,8 +87,6 @@ private:
 
 	ModelVector<TraceAnalysis *> trace_analyses;
 
-	/** @bref Implement restart. */
-	void do_restart();
 	/** @bref Plugin that can inspect new actions. */
 	TraceAnalysis *inspect_plugin;
 	/** @brief The cumulative execution stats */
@@ -98,10 +96,10 @@ private:
 	void print_bugs() const;
 	void print_execution(bool printbugs) const;
 	void print_stats() const;
-
-	friend void user_main_wrapper();
 };
 
 extern ModelChecker *model;
+void parse_options(struct model_params *params);
+void install_trace_analyses(ModelExecution *execution);
 
 #endif	/* __MODEL_H__ */