X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=c5a5aa78647deb2bfdb3ae7cf269b972ae5f89f0;hp=82d9bc8c4fc9853f15ed3b2d2bef7e6e1f27cf83;hb=2f382c791daa529ed998c35d017703d52ab46d9d;hpb=39e9009d50498d0dd1bccc1a54e378f7aef5a28a

diff --git a/model.h b/model.h
index 82d9bc8c..c5a5aa78 100644
--- a/model.h
+++ b/model.h
@@ -16,16 +16,15 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
+#include "snapshot-interface.h"
 
 typedef SnapList<ModelAction *> action_list_t;
 
 /** @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 */
@@ -58,14 +57,13 @@ 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 startMainThread();
 	void startChecker();
 	Thread * getInitThread() {return init_thread;}
 	Scheduler * getScheduler() {return scheduler;}
@@ -74,11 +72,14 @@ 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;
+	ModelHistory * history;
 	ModelExecution *execution;
 	Thread * init_thread;
-	ModelHistory *history;
 
 	int execution_number;
 
@@ -105,9 +106,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__ */