X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=3327683e65efb21c2fe716c6ccc6fbef1cc8dc8f;hp=12ec06c060a999e256dfb57ea0088c97a09f81c3;hb=78ec1662db6d8967b68d10602131d0ea7f3794e1;hpb=2b004336a919f74a5ca8f6d87ad5414360a949c7

diff --git a/model.h b/model.h
index 12ec06c..3327683 100644
--- a/model.h
+++ b/model.h
@@ -15,6 +15,7 @@
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "context.h"
+#include "params.h"
 
 /* Forward declaration */
 class Node;
@@ -24,45 +25,13 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
+class TraceAnalysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
 typedef ModelVector<const ModelAction *> rel_heads_list_t;
-
 typedef SnapList<ModelAction *> action_list_t;
 
-/**
- * Model checker parameter structure. Holds run-time configuration options for
- * the model checker.
- */
-struct model_params {
-	int maxreads;
-	int maxfuturedelay;
-	bool yieldon;
-	unsigned int fairwindow;
-	unsigned int enabledcount;
-	unsigned int bound;
-	unsigned int uninitvalue;
-
-	/** @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;
-
-	/** @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 */
@@ -132,11 +101,17 @@ public:
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
 	bool isfeasibleprefix() const;
 
-	bool assert_bug(const char *msg);
+	bool assert_bug(const char *msg, ...);
 	void assert_user_bug(const char *msg);
 
 	const model_params params;
 	Node * get_curr_node() const;
+	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;
 
 	MEMALLOC
 private:
@@ -168,9 +143,11 @@ private:
 	bool process_thread_action(ModelAction *curr);
 	void process_relseq_fixup(ModelAction *curr, work_queue_t *work_queue);
 	bool read_from(ModelAction *act, const ModelAction *rf);
+	bool synchronize(const ModelAction *first, ModelAction *second);
 	bool check_action_enabled(ModelAction *curr);
 
 	Thread * take_step(ModelAction *curr);
+	bool should_terminate_execution();
 
 	template <typename T>
 	bool check_recency(ModelAction *curr, const T *rf) const;
@@ -196,7 +173,6 @@ private:
 
 	void check_curr_backtracking(ModelAction *curr);
 	void add_action_to_lists(ModelAction *act);
-	ModelAction * get_last_action(thread_id_t tid) const;
 	ModelAction * get_last_fence_release(thread_id_t tid) const;
 	ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
 	ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
@@ -245,6 +221,8 @@ private:
 	SnapVector<ModelAction *> * const thrd_last_action;
 	SnapVector<ModelAction *> * const thrd_last_fence_release;
 	NodeStack * const node_stack;
+	ModelVector<TraceAnalysis *> * trace_analyses;
+
 
 	/** Private data members that should be snapshotted. They are grouped
 	 * together for efficiency and maintainability. */
@@ -273,11 +251,12 @@ private:
 	/** @brief The cumulative execution stats */
 	struct execution_stats stats;
 	void record_stats();
-
+	void run_trace_analyses();
 	void print_infeasibility(const char *prefix) const;
 	bool is_feasible_prefix_ignore_relseq() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;
+	bool too_many_steps() const;
 	bool is_complete_execution() const;
 	bool have_bug_reports() const;
 	void print_bugs() const;