X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=3f1103e543fa987164cc8d75f7c0c92779a6ff86;hp=7065960b882bc8fc71eb3da2f8565fb1adc9eb9d;hb=63805dcdd30b0d728233eff298eec01977a50ee6;hpb=2b3b99cf4f2ee891bf416707fc8af8ba63337efc

diff --git a/model.h b/model.h
index 7065960b..3f1103e5 100644
--- a/model.h
+++ b/model.h
@@ -47,11 +47,29 @@ struct model_params {
 	 *  expiration time exceeds the existing one by more than the slop
 	 *  value */
 	unsigned int expireslop;
+
+	/** @brief Verbosity (0 = quiet; 1 = noisy) */
+	int verbose;
+
+	/** @brief Command-line argument count to pass to user program */
+	int argc;
+
+	/** @brief Command-line arguments to pass to user program */
+	char **argv;
+};
+
+/** @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 */
 };
 
 struct PendingFutureValue {
 	ModelAction *writer;
-	ModelAction * act;
+	ModelAction *act;
 };
 
 /** @brief Records information regarding a single pending release sequence */
@@ -73,11 +91,12 @@ public:
 	ModelChecker(struct model_params params);
 	~ModelChecker();
 
+	void run();
+
 	/** @returns the context for the main model-checking system thread */
 	ucontext_t * get_system_context() { return &system_context; }
 
-	/** Prints an execution summary with trace information. */
-	void print_summary();
+	void print_summary() const;
 #if SUPPORT_MOD_ORDER_DUMP
 	void dumpGraph(char *filename);
 #endif
@@ -87,6 +106,9 @@ public:
 	Thread * get_thread(thread_id_t tid) const;
 	Thread * get_thread(ModelAction *act) const;
 
+	bool is_enabled(Thread *t) const;
+	bool is_enabled(thread_id_t tid) const;
+
 	thread_id_t get_next_id();
 	unsigned int get_num_threads() const;
 	Thread * get_current_thread();
@@ -94,25 +116,18 @@ public:
 	int switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid);
 	ModelAction * get_parent_action(thread_id_t tid);
-	bool next_execution();
-	bool isfeasible();
-	bool isfeasibleotherthanRMW();
-	bool isfinalfeasible();
 	void check_promises_thread_disabled();
 	void mo_check_promises(thread_id_t tid, const ModelAction *write);
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv);
 	void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
-	void finish_execution();
-	bool isfeasibleprefix();
-	void set_assert() {asserted=true;}
-	bool is_deadlocked() const;
+	bool isfeasibleprefix() const;
+
+	bool assert_bug(const char *msg);
+	void assert_user_bug(const char *msg);
 
-	/** @brief Alert the model-checker that an incorrectly-ordered
-	 * synchronization was made */
-	void set_bad_synchronization() { bad_synchronization = true; }
+	void set_bad_synchronization();
 
 	const model_params params;
-	Scheduler * get_scheduler() { return scheduler;}
 	Node * get_curr_node();
 
 	MEMALLOC
@@ -123,15 +138,14 @@ private:
 	bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
 	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
-	bool has_asserted() {return asserted;}
-	void reset_asserted() {asserted=false;}
-	int num_executions;
-	int num_feasible_executions;
-	bool promises_expired();
+	bool has_asserted() const;
+	void set_assert();
+	bool promises_expired() const;
 	void execute_sleep_set();
 	void wake_up_sleeping_actions(ModelAction * curr);
 	modelclock_t get_next_seq_num();
 
+	bool next_execution();
 	void set_current_action(ModelAction *act);
 	Thread * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
@@ -176,17 +190,17 @@ private:
 
 	/** Per-object list of actions. Maps an object (i.e., memory location)
 	 * to a trace of all actions performed on the object. */
-	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
+	HashTable<const void *, action_list_t *, uintptr_t, 4> *obj_map;
 
 	/** Per-object list of actions. Maps an object (i.e., memory location)
 	 * to a trace of all actions performed on the object. */
-	HashTable<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
+	HashTable<const void *, action_list_t *, uintptr_t, 4> *lock_waiters_map;
 
 	/** Per-object list of actions. Maps an object (i.e., memory location)
 	 * to a trace of all actions performed on the object. */
-	HashTable<const void *, action_list_t, uintptr_t, 4> *condvar_waiters_map;
+	HashTable<const void *, action_list_t *, uintptr_t, 4> *condvar_waiters_map;
 
-	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+	HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > *obj_thrd_map;
 	std::vector< Promise *, SnapshotAlloc<Promise *> > *promises;
 	std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > *futurevalues;
 
@@ -224,11 +238,22 @@ private:
 	 * <tt>b</tt>.
 	 */
 	CycleGraph *mo_graph;
-	bool failed_promise;
-	bool too_many_reads;
-	bool asserted;
-	/** @brief Incorrectly-ordered synchronization was made */
-	bool bad_synchronization;
+
+	/** @brief The cumulative execution stats */
+	struct execution_stats stats;
+	void record_stats();
+
+	bool isfinalfeasible() const;
+	bool is_infeasible_ignoreRMW() const;
+	bool is_infeasible() const;
+	bool is_deadlocked() const;
+	bool is_complete_execution() const;
+	bool have_bug_reports() const;
+	void print_bugs() const;
+	void print_execution(bool printbugs) const;
+	void print_stats() const;
+
+	friend void user_main_wrapper();
 };
 
 extern ModelChecker *model;