X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=90c8a55e5f96f7ca93a6adcd6c6f28fdac96fa4a;hb=7921811e8bd7bba2cdd892434a58ec7254ae0f99;hp=a72e0b50ef8188c49188dee959085f807625dcfa;hpb=91154c0e76e77ff53c968f3aa7ad7626fae19acb;p=model-checker.git

diff --git a/model.h b/model.h
index a72e0b5..90c8a55 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,6 +24,7 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
+class Trace_Analysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
@@ -73,9 +74,11 @@ struct execution_stats {
 };
 
 struct PendingFutureValue {
-	PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+	PendingFutureValue(ModelAction *writer, ModelAction *reader) :
+		writer(writer), reader(reader)
+	{ }
 	const ModelAction *writer;
-	ModelAction *act;
+	ModelAction *reader;
 };
 
 /** @brief Records information regarding a single pending release sequence */
@@ -111,8 +114,6 @@ public:
 	void dumpGraph(char *filename) const;
 #endif
 
-	void add_thread(Thread *t);
-	void remove_thread(Thread *t);
 	Thread * get_thread(thread_id_t tid) const;
 	Thread * get_thread(const ModelAction *act) const;
 	int get_promise_number(const Promise *promise) const;
@@ -132,7 +133,7 @@ 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;
@@ -143,9 +144,12 @@ private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
 
+	void add_thread(Thread *t);
+
 	bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
-	bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
+	bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader) const;
 	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
+	bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
 	bool has_asserted() const;
 	void set_assert();
 	void set_bad_synchronization();
@@ -168,6 +172,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;
@@ -183,8 +188,8 @@ private:
 	bool set_latest_backtrack(ModelAction *act);
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
-	int get_promise_to_resolve(const ModelAction *curr) const;
-	bool resolve_promise(ModelAction *curr, unsigned int promise_idx);
+	Promise * pop_promise_to_resolve(const ModelAction *curr);
+	bool resolve_promise(ModelAction *curr, Promise *promise);
 	void compute_promises(ModelAction *curr);
 	void compute_relseq_breakwrites(ModelAction *curr);
 
@@ -223,10 +228,6 @@ private:
 	 * to a trace of all actions performed on the object. */
 	HashTable<const void *, action_list_t *, uintptr_t, 4> * const 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> * const 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> * const condvar_waiters_map;
@@ -246,6 +247,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. */
@@ -274,12 +277,11 @@ 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 is_circular_wait(const Thread *t) const;
 	bool is_complete_execution() const;
 	bool have_bug_reports() const;
 	void print_bugs() const;