X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=d0043a1f88b1990de8e0fcdee27e21baa387ccd7;hb=a69e8aff5040edf3c2448d401b69e2411723c557;hp=c99e0f8b424ddbe8079593713e498e53fe6fb80e;hpb=d27984bb297795f4e9a4531e2730d8188a799e89;p=model-checker.git

diff --git a/model.h b/model.h
index c99e0f8..d0043a1 100644
--- a/model.h
+++ b/model.h
@@ -36,6 +36,7 @@ struct model_params {
 	int maxfuturedelay;
 	unsigned int fairwindow;
 	unsigned int enabledcount;
+	unsigned int bound;
 };
 
 struct PendingFutureValue {
@@ -111,6 +112,7 @@ public:
 
 	const model_params params;
 	Scheduler * get_scheduler() { return scheduler;}
+	Node * get_curr_node();
 
 	MEMALLOC
 private:
@@ -169,7 +171,6 @@ private:
 	bool w_modification_order(ModelAction *curr);
 	bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
 	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
-	void do_complete_join(ModelAction *join);
 
 	ModelAction *diverge;
 	ModelAction *earliest_diverge;
@@ -186,6 +187,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;