X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=d582cdabed800d6cd10cbca7599de3134a7c00e3;hb=8714c78cf3335c3b9f922828e394f98cd0e69428;hp=d6c033725dedf36bed645f5615f19d45444b2f07;hpb=1b793f0683aff025afe2e19519572e3599575a19;p=c11tester.git

diff --git a/model.h b/model.h
index d6c03372..d582cdab 100644
--- a/model.h
+++ b/model.h
@@ -89,7 +89,7 @@ public:
 	Thread * get_thread(ModelAction *act) const;
 
 	thread_id_t get_next_id();
-	unsigned int get_num_threads();
+	unsigned int get_num_threads() const;
 	Thread * get_current_thread();
 
 	int switch_to_master(ModelAction *act);
@@ -99,12 +99,14 @@ 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);
 	void finish_execution();
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
+	bool is_deadlocked() const;
 
 	/** @brief Alert the model-checker that an incorrectly-ordered
 	 * synchronization was made */
@@ -139,7 +141,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);
@@ -187,6 +189,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;