X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=0701d467d21f12eeedcad6e88787103b33966e97;hb=96cc6915859876bd9a5c1774a5195058c7c2442c;hp=fec8d1f1ea55bf331017f9817515cae7e0d93c34;hpb=0cb05db166b91ab2820fd8c58b6903ca3a455e04;p=model-checker.git

diff --git a/model.h b/model.h
index fec8d1f..0701d46 100644
--- a/model.h
+++ b/model.h
@@ -17,12 +17,16 @@
 #include "action.h"
 #include "clockvector.h"
 #include "hashtable.h"
+#include "workqueue.h"
 
 /* Forward declaration */
 class NodeStack;
 class CycleGraph;
 class Promise;
 
+/** @brief Shorthand for a list of release sequence heads */
+typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_heads_list_t;
+
 /**
  * Model checker parameter structure. Holds run-time configuration options for
  * the model checker.
@@ -30,6 +34,14 @@ class Promise;
 struct model_params {
 	int maxreads;
 	int maxfuturedelay;
+	unsigned int fairwindow;
+	unsigned int enabledcount;
+};
+
+struct PendingFutureValue {
+	uint64_t value;
+	modelclock_t expiration;
+	ModelAction * act;
 };
 
 /**
@@ -78,23 +90,23 @@ public:
 	bool isfeasibleotherthanRMW();
 	bool isfinalfeasible();
 	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
-	void get_release_seq_heads(ModelAction *act,
-	                std::vector<const ModelAction *> *release_heads);
+	void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
 	void finish_execution();
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
+	const model_params params;
 
 	MEMALLOC
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
-	
+
 	bool thin_air_constraint_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();
-	const model_params params;
 
 	/**
 	 * Stores the ModelAction for the current thread action.  Call this
@@ -104,11 +116,15 @@ private:
 	 */
 	void set_current_action(ModelAction *act) { priv->current_action = act; }
 	Thread * check_current_action(ModelAction *curr);
-	bool process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw);
+	ModelAction * initialize_curr_action(ModelAction *curr);
+	bool process_read(ModelAction *curr, bool second_part_of_rmw);
+	bool process_write(ModelAction *curr);
+	void process_mutex(ModelAction *curr);
+	bool check_action_enabled(ModelAction *curr);
 
 	bool take_step();
 
-	void check_recency(ModelAction *curr, bool already_added);
+	void check_recency(ModelAction *curr);
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
@@ -117,19 +133,19 @@ private:
 	bool resolve_promises(ModelAction *curr);
 	void compute_promises(ModelAction *curr);
 
-
 	void check_curr_backtracking(ModelAction * curr);
 	void add_action_to_lists(ModelAction *act);
-	ModelAction * get_last_action(thread_id_t tid);
-	ModelAction * get_last_seq_cst(const void *location);
+	ModelAction * get_last_action(thread_id_t tid) const;
+	ModelAction * get_last_seq_cst(ModelAction *curr) const;
+	ModelAction * get_last_unlock(ModelAction *curr) const;
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
 	void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool w_modification_order(ModelAction *curr);
-	bool release_seq_head(const ModelAction *rf,
-	                std::vector<const ModelAction *> *release_heads) const;
-	bool resolve_release_sequences(void *location);
+	bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const;
+	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
+	void do_complete_join(ModelAction *join);
 
 	ModelAction *diverge;
 
@@ -141,8 +157,13 @@ private:
 	 * to a trace of all actions performed on the object. */
 	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<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
 	std::vector<Promise *> *promises;
+	std::vector<struct PendingFutureValue> *futurevalues;
 
 	/**
 	 * Collection of lists of objects that might synchronize with one or
@@ -151,7 +172,7 @@ private:
 	 * This structure maps its lists by object location. Each ModelAction
 	 * in the lists should be an acquire operation.
 	 */
-	HashTable<void *, std::list<ModelAction *>, uintptr_t, 4> *lazy_sync_with_release;
+	HashTable<void *, action_list_t, uintptr_t, 4> *lazy_sync_with_release;
 
 	/**
 	 * Represents the total size of the