X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=model.h;h=85deb05e911dc33ae7ea1b245625802dbf4c8708;hp=d582cdabed800d6cd10cbca7599de3134a7c00e3;hb=dc0339b4449ed07afa7c69936108146d72676a68;hpb=f8cb4932d34c260d586e904e6e17fb75a64e3d67

diff --git a/model.h b/model.h
index d582cdab..85deb05e 100644
--- a/model.h
+++ b/model.h
@@ -23,6 +23,7 @@ class CycleGraph;
 class Promise;
 class Scheduler;
 class Thread;
+struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
@@ -37,22 +38,28 @@ struct model_params {
 	unsigned int fairwindow;
 	unsigned int enabledcount;
 	unsigned int bound;
+
+	/** @brief Maximum number of future values that can be sent to the same
+	 *  read */
+	int maxfuturevalues;
+
+	/** @brief Only generate a new future value/expiration pair if the
+	 *  expiration time exceeds the existing one by more than the slop
+	 *  value */
+	unsigned int expireslop;
 };
 
-struct PendingFutureValue {
-	ModelAction *writer;
-	ModelAction * act;
+/** @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 */
 };
 
-/**
- * Structure for holding small ModelChecker members that should be snapshotted
- */
-struct model_snapshot_members {
-	ModelAction *current_action;
-	unsigned int next_thread_id;
-	modelclock_t used_sequence_numbers;
-	Thread *nextThread;
-	ModelAction *next_backtrack;
+struct PendingFutureValue {
+	ModelAction *writer;
+	ModelAction *act;
 };
 
 /** @brief Records information regarding a single pending release sequence */
@@ -88,6 +95,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();
@@ -96,24 +106,28 @@ public:
 	ClockVector * get_cv(thread_id_t tid);
 	ModelAction * get_parent_action(thread_id_t tid);
 	bool next_execution();
-	bool isfeasible();
-	bool isfeasibleotherthanRMW();
-	bool isfinalfeasible();
+	bool isfeasible() const;
+	bool isfeasibleotherthanRMW() const;
+	bool isfinalfeasible() const;
 	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();
+	bool isfeasibleprefix() const;
+
+	bool assert_bug(const char *msg);
+	void assert_user_bug(const char *msg);
+
 	void set_assert() {asserted=true;}
 	bool is_deadlocked() const;
+	bool is_complete_execution() const;
 
 	/** @brief Alert the model-checker that an incorrectly-ordered
 	 * synchronization was made */
 	void set_bad_synchronization() { bad_synchronization = true; }
 
 	const model_params params;
-	Scheduler * get_scheduler() { return scheduler;}
 	Node * get_curr_node();
 
 	MEMALLOC
@@ -126,20 +140,12 @@ private:
 	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 promises_expired() const;
 	void execute_sleep_set();
 	void wake_up_sleeping_actions(ModelAction * curr);
 	modelclock_t get_next_seq_num();
 
-	/**
-	 * Stores the ModelAction for the current thread action.  Call this
-	 * immediately before switching from user- to system-context to pass
-	 * data between them.
-	 * @param act The ModelAction created by the user-thread action
-	 */
-	void set_current_action(ModelAction *act) { priv->current_action = act; }
+	void set_current_action(ModelAction *act);
 	Thread * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, bool second_part_of_rmw);
@@ -183,17 +189,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;
 
@@ -236,6 +242,14 @@ private:
 	bool asserted;
 	/** @brief Incorrectly-ordered synchronization was made */
 	bool bad_synchronization;
+
+	/** @brief The cumulative execution stats */
+	struct execution_stats stats;
+	void record_stats();
+	void print_stats() const;
+
+	bool have_bug_reports() const;
+	void print_bugs() const;
 };
 
 extern ModelChecker *model;