X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=8ff9d375838b193bec751f9b7f0d419a89f07a8d;hb=37bf8e7d54c72e0aeee029a491e45bb9d7b2f409;hp=7bc3585d8562eeff369cf307b81751781e381f6b;hpb=b8b39c87557325a384faa45d0cae56a6f71f52b1;p=model-checker.git

diff --git a/model.h b/model.h
index 7bc3585..8ff9d37 100644
--- a/model.h
+++ b/model.h
@@ -36,11 +36,11 @@ struct model_params {
 	int maxfuturedelay;
 	unsigned int fairwindow;
 	unsigned int enabledcount;
+	unsigned int bound;
 };
 
 struct PendingFutureValue {
-	uint64_t value;
-	modelclock_t expiration;
+	ModelAction *writer;
 	ModelAction * act;
 };
 
@@ -112,13 +112,16 @@ public:
 
 	const model_params params;
 	Scheduler * get_scheduler() { return scheduler;}
+	Node * get_curr_node();
 
 	MEMALLOC
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
 
+	bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
 	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
+	bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}
 	int num_executions;
@@ -136,7 +139,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);
@@ -168,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;
@@ -185,9 +187,13 @@ 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 *> *promises;
-	std::vector<struct PendingFutureValue> *futurevalues;
+	std::vector< Promise *, SnapshotAlloc<Promise *> > *promises;
+	std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > *futurevalues;
 
 	/**
 	 * List of pending release sequences. Release sequences might be
@@ -195,9 +201,9 @@ private:
 	 * are established. Each entry in the list may only be partially
 	 * filled, depending on its pending status.
 	 */
-	std::vector<struct release_seq *> *pending_rel_seqs;
+	std::vector< struct release_seq *, SnapshotAlloc<struct release_seq *> > *pending_rel_seqs;
 
-	std::vector<ModelAction *> *thrd_last_action;
+	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > *thrd_last_action;
 	NodeStack *node_stack;
 
 	/** Private data members that should be snapshotted. They are grouped