X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=model.h;h=ee9d2c71280175e4dfe0380380b0839cfaa599f5;hb=3f77119600ac3aa246258dec2776056d09f8e4e0;hp=08bde0f8256d9005cc210a18f8ea4aefcf37c263;hpb=c399a44cb63c43c83c11fe6cfab02889896ecff1;p=model-checker.git

diff --git a/model.h b/model.h
index 08bde0f..ee9d2c7 100644
--- a/model.h
+++ b/model.h
@@ -8,20 +8,22 @@
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
+#include <inttypes.h>
 
 #include "mymemory.h"
-#include "action.h"
 #include "hashtable.h"
 #include "workqueue.h"
 #include "config.h"
 #include "modeltypes.h"
 
 /* Forward declaration */
+class Node;
 class NodeStack;
 class CycleGraph;
 class Promise;
 class Scheduler;
 class Thread;
+class ClockVector;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
@@ -137,7 +139,7 @@ public:
 	MEMALLOC
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
-	Scheduler *scheduler;
+	Scheduler * const scheduler;
 
 	bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
 	bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
@@ -147,6 +149,7 @@ private:
 	void set_bad_synchronization();
 	bool promises_expired() const;
 	void execute_sleep_set();
+	bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
 	void wake_up_sleeping_actions(ModelAction *curr);
 	modelclock_t get_next_seq_num();
 
@@ -165,7 +168,8 @@ private:
 	Thread * take_step(ModelAction *curr);
 
 	void check_recency(ModelAction *curr, const ModelAction *rf);
-	ModelAction * get_last_conflict(ModelAction *act);
+	ModelAction * get_last_fence_conflict(ModelAction *act) const;
+	ModelAction * get_last_conflict(ModelAction *act) const;
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
 	bool set_latest_backtrack(ModelAction *act);
@@ -182,7 +186,7 @@ private:
 	ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
 	ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
 	ModelAction * get_last_unlock(ModelAction *curr) const;
-	void build_reads_from_past(ModelAction *curr);
+	void build_may_read_from(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
 
 	template <typename rf_type>
@@ -200,24 +204,24 @@ private:
 	ModelAction *earliest_diverge;
 
 	ucontext_t system_context;
-	action_list_t *action_trace;
-	HashTable<int, Thread *, int> *thread_map;
+	action_list_t * const action_trace;
+	HashTable<int, Thread *, int> * const thread_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> *obj_map;
+	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> *lock_waiters_map;
+	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> *condvar_waiters_map;
+	HashTable<const void *, action_list_t *, uintptr_t, 4> * const condvar_waiters_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;
+	HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > * const obj_thrd_map;
+	std::vector< Promise *, SnapshotAlloc<Promise *> > * const promises;
+	std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > * const futurevalues;
 
 	/**
 	 * List of pending release sequences. Release sequences might be
@@ -225,15 +229,15 @@ private:
 	 * are established. Each entry in the list may only be partially
 	 * filled, depending on its pending status.
 	 */
-	std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > *pending_rel_seqs;
+	std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > * const pending_rel_seqs;
 
-	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_action;
-	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_fence_release;
-	NodeStack *node_stack;
+	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_action;
+	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > * const thrd_last_fence_release;
+	NodeStack * const node_stack;
 
 	/** Private data members that should be snapshotted. They are grouped
 	 * together for efficiency and maintainability. */
-	struct model_snapshot_members *priv;
+	struct model_snapshot_members * const priv;
 
 	/** A special model-checker Thread; used for associating with
 	 *  model-checker-related ModelAcitons */
@@ -253,7 +257,7 @@ private:
 	 * such that <tt>a --> b</tt> means <tt>a</tt> was ordered before
 	 * <tt>b</tt>.
 	 */
-	CycleGraph *mo_graph;
+	CycleGraph * const mo_graph;
 
 	/** @brief The cumulative execution stats */
 	struct execution_stats stats;