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

diff --git a/model.h b/model.h
index 7bc3585..6e470c0 100644
--- a/model.h
+++ b/model.h
@@ -39,8 +39,7 @@ struct model_params {
 };
 
 struct PendingFutureValue {
-	uint64_t value;
-	modelclock_t expiration;
+	ModelAction *writer;
 	ModelAction * act;
 };
 
@@ -118,7 +117,9 @@ 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;
@@ -168,7 +169,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,8 +186,8 @@ private:
 	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;
+	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 +195,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