X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=b5c7c30520cb7138cb4219bf8c35a21a6c69d0ab;hb=38cb7400c16ad0a04355ec77af2bf5da2dbfaad5;hp=cbd1027cf3c6874227ddf3ce9631cbea69b6eb82;hpb=d1e11baca91adc67244597858f1b63abfb1d5507;p=model-checker.git

diff --git a/model.h b/model.h
index cbd1027..b5c7c30 100644
--- a/model.h
+++ b/model.h
@@ -6,7 +6,6 @@
 #define __MODEL_H__
 
 #include <cstddef>
-#include <ucontext.h>
 #include <inttypes.h>
 
 #include "mymemory.h"
@@ -15,6 +14,7 @@
 #include "config.h"
 #include "modeltypes.h"
 #include "stl-model.h"
+#include "context.h"
 
 /* Forward declaration */
 class Node;
@@ -24,11 +24,11 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
+class Trace_Analysis;
 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;
 
 /**
@@ -39,6 +39,7 @@ struct model_params {
 	int maxreads;
 	int maxfuturedelay;
 	bool yieldon;
+	bool sc_trace_analysis;
 	unsigned int fairwindow;
 	unsigned int enabledcount;
 	unsigned int bound;
@@ -132,11 +133,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(Trace_Analysis * 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:
@@ -171,6 +178,7 @@ private:
 	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 +204,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 +252,8 @@ private:
 	SnapVector<ModelAction *> * const thrd_last_action;
 	SnapVector<ModelAction *> * const thrd_last_fence_release;
 	NodeStack * const node_stack;
+	ModelVector<Trace_Analysis *> * trace_analyses;
+
 
 	/** Private data members that should be snapshotted. They are grouped
 	 * together for efficiency and maintainability. */
@@ -273,7 +282,7 @@ 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;