X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=9fb94228a3a9f6460a17dbe6f74754062a5934f8;hp=7d84f60112c5ef26b8c54cf9e139f016fc05df7b;hb=729acbffd2562f10dd1864b010c3623faa485513;hpb=a726f5f6e1e0731a0516be1e9e23397744734ef5

diff --git a/model.h b/model.h
index 7d84f601..9fb94228 100644
--- a/model.h
+++ b/model.h
@@ -15,74 +15,72 @@
 #include "stl-model.h"
 #include "context.h"
 #include "params.h"
-
-/* Forward declaration */
-class Node;
-class NodeStack;
-class CycleGraph;
-class Promise;
-class Scheduler;
-class Thread;
-class ClockVector;
-class TraceAnalysis;
-class ModelExecution;
-class ModelAction;
+#include "classlist.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 */
+	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 */
 class ModelChecker {
 public:
-	ModelChecker(struct model_params params);
+	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; }
 
-	const ModelExecution * get_execution() const { return execution; }
+	ModelExecution * get_execution() const { return execution; }
+	ModelHistory * get_history() const { return history; }
+
+	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);
 	uint64_t switch_to_master(ModelAction *act);
 
 	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);
-	}
-
-	action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
-	ModelAction * get_last_action(thread_id_t tid) const;
+	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();
 	MEMALLOC
 private:
+	/** Flag indicates whether to restart the model checker. */
+	bool restart_flag;
+
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
-	NodeStack * const node_stack;
 	ModelExecution *execution;
+	Thread * init_thread;
+	ModelHistory *history;
+
+	int execution_number;
 
-	void execute_sleep_set();
+	unsigned int get_num_threads() const;
 
 	bool next_execution();
 	bool should_terminate_execution();
@@ -90,14 +88,14 @@ private:
 	Thread * get_next_thread();
 	void reset_to_initial_state();
 
-
-	ModelAction *diverge;
-	ModelAction *earliest_diverge;
-
 	ucontext_t system_context;
 
 	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 */
 	struct execution_stats stats;
 	void record_stats();
@@ -110,5 +108,4 @@ private:
 };
 
 extern ModelChecker *model;
-
-#endif /* __MODEL_H__ */
+#endif	/* __MODEL_H__ */