X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=59a07597bb5bf0436752ad6a4fca2f22d9fa2fe8;hb=d1fab609e185bf89056da0f88030750d28bc9b32;hp=01dd35b03752504dc9416543f38588018297adf6;hpb=075d78a2e09fd11b8b78b6c7b3852a42a279c4f2;p=model-checker.git

diff --git a/model.h b/model.h
index 01dd35b..59a0759 100644
--- a/model.h
+++ b/model.h
@@ -99,6 +99,7 @@ public:
 	bool isfeasible();
 	bool isfeasibleotherthanRMW();
 	bool isfinalfeasible();
+	void check_promises_thread_disabled();
 	void mo_check_promises(thread_id_t tid, const ModelAction *write);
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv);
 	void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
@@ -112,6 +113,7 @@ public:
 
 	const model_params params;
 	Scheduler * get_scheduler() { return scheduler;}
+	Node * get_curr_node();
 
 	MEMALLOC
 private:
@@ -138,7 +140,7 @@ private:
 	 */
 	void set_current_action(ModelAction *act) { priv->current_action = act; }
 	Thread * check_current_action(ModelAction *curr);
-	ModelAction * initialize_curr_action(ModelAction *curr);
+	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, bool second_part_of_rmw);
 	bool process_write(ModelAction *curr);
 	bool process_mutex(ModelAction *curr);
@@ -186,6 +188,10 @@ private:
 	 * to a trace of all actions performed on the object. */
 	HashTable<const void *, action_list_t, uintptr_t, 4> *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<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;