X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=9e52f53752e016152bcc9d8267890472e391d1a8;hp=a37bd49d5e0deb818cdfa833336140554fa984a8;hb=refs%2Fheads%2Fmaster;hpb=91579dadd25579b9aa7e1dd7a537892c9b1e9311

diff --git a/model.h b/model.h
index a37bd49d..d71ad8f6 100644
--- a/model.h
+++ b/model.h
@@ -16,16 +16,18 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
+#include "snapshot-interface.h"
 
-typedef SnapList<ModelAction *> action_list_t;
+#define ENTER_MODEL_FLAG (inside_model = 1)
+#define EXIT_MODEL_FLAG (inside_model = 0)
+#define GET_MODEL_FLAG (inside_model)
+#define RESTORE_MODEL_FLAG(f) (inside_model = f)
 
 /** @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 */
@@ -34,19 +36,11 @@ 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; }
 
 	int get_execution_number() const { return execution_number; }
 
@@ -54,47 +48,54 @@ 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);
 
-	bool assert_bug(const char *msg, ...);
-	bool assert_race(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;}
 	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;
 	ModelExecution *execution;
 	Thread * init_thread;
-	ModelHistory *history;
 
 	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 */
@@ -104,9 +105,12 @@ private:
 	void print_bugs() const;
 	void print_execution(bool printbugs) const;
 	void print_stats() const;
-
-	friend void user_main_wrapper();
 };
 
+extern int inside_model;
 extern ModelChecker *model;
+void parse_options(struct model_params *params);
+void install_trace_analyses(ModelExecution *execution);
+void createModelIfNotExist();
+
 #endif	/* __MODEL_H__ */