X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=b8a485931882f119ff5b70140c63f213fb79658f;hb=31246eff241f4593a33501f8c33b6eadca1d7664;hp=c3e5830211c9276ec7b5004504fbb9472df32069;hpb=50b95c3747f4fe79b2ab1a1a6fc303224e16e418;p=model-checker.git

diff --git a/model.h b/model.h
index c3e5830..b8a4859 100644
--- a/model.h
+++ b/model.h
@@ -17,6 +17,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "hashtable.h"
+#include "workqueue.h"
 
 /* Forward declaration */
 class NodeStack;
@@ -29,6 +30,13 @@ class Promise;
  */
 struct model_params {
 	int maxreads;
+	int maxfuturedelay;
+};
+
+struct PendingFutureValue {
+	uint64_t value;
+	modelclock_t expiration;
+	ModelAction * act;
 };
 
 /**
@@ -60,6 +68,7 @@ public:
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
 	Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
+	Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
 
 	thread_id_t get_next_id();
 	int get_num_threads();
@@ -73,11 +82,11 @@ public:
 	ModelAction * get_parent_action(thread_id_t tid);
 	bool next_execution();
 	bool isfeasible();
+	bool isfeasibleotherthanRMW();
 	bool isfinalfeasible();
 	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 	void get_release_seq_heads(ModelAction *act,
-	                std::vector<const ModelAction *> *release_heads);
-
+	                std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads);
 	void finish_execution();
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
@@ -87,10 +96,12 @@ private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler *scheduler;
 
+	bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}
 	int num_executions;
-
+	int num_feasible_executions;
+	bool promises_expired();
 	const model_params params;
 
 	/**
@@ -101,11 +112,13 @@ private:
 	 */
 	void set_current_action(ModelAction *act) { priv->current_action = act; }
 	Thread * check_current_action(ModelAction *curr);
-	bool process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw);
+	ModelAction * initialize_curr_action(ModelAction *curr);
+	bool process_read(ModelAction *curr, bool second_part_of_rmw);
+	bool process_write(ModelAction *curr);
 
 	bool take_step();
 
-	void check_recency(ModelAction *curr, bool already_added);
+	void check_recency(ModelAction *curr);
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
@@ -114,17 +127,18 @@ private:
 	bool resolve_promises(ModelAction *curr);
 	void compute_promises(ModelAction *curr);
 
+	void check_curr_backtracking(ModelAction * curr);
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid);
-	ModelAction * get_last_seq_cst(const void *location);
+	ModelAction * get_last_seq_cst(ModelAction *curr);
 	void build_reads_from_past(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
 	void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool r_modification_order(ModelAction *curr, const ModelAction *rf);
 	bool w_modification_order(ModelAction *curr);
 	bool release_seq_head(const ModelAction *rf,
-	                std::vector<const ModelAction *> *release_heads) const;
-	bool resolve_release_sequences(void *location);
+	                std::vector< const ModelAction *, MyAlloc<const ModelAction *> > *release_heads) const;
+	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
 
 	ModelAction *diverge;
 
@@ -138,6 +152,7 @@ private:
 
 	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
 	std::vector<Promise *> *promises;
+	std::vector<struct PendingFutureValue> *futurevalues;
 
 	/**
 	 * Collection of lists of objects that might synchronize with one or