X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=ae9706b124067e18e5098e0fbd7e7859fce05d73;hb=e6789461057e3395ba78575b85c114b553f4ed19;hp=9e0b34ba18b25cf642a92dea56321763c23b48ba;hpb=61d1e3ae29b690f69cf77c5a6f836fb36507a694;p=model-checker.git

diff --git a/model.h b/model.h
index 9e0b34b..ae9706b 100644
--- a/model.h
+++ b/model.h
@@ -38,6 +38,7 @@ typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
 struct model_params {
 	int maxreads;
 	int maxfuturedelay;
+	bool yieldon;
 	unsigned int fairwindow;
 	unsigned int enabledcount;
 	unsigned int bound;
@@ -113,6 +114,7 @@ public:
 	void remove_thread(Thread *t);
 	Thread * get_thread(thread_id_t tid) const;
 	Thread * get_thread(const ModelAction *act) const;
+	int get_promise_number(const Promise *promise) const;
 
 	bool is_enabled(Thread *t) const;
 	bool is_enabled(thread_id_t tid) const;
@@ -166,15 +168,22 @@ private:
 
 	Thread * take_step(ModelAction *curr);
 
-	void check_recency(ModelAction *curr, const ModelAction *rf);
+	template <typename T>
+	bool check_recency(ModelAction *curr, const T *rf) const;
+
+	template <typename T, typename U>
+	bool should_read_instead(const ModelAction *curr, const T *rf, const U *other_rf) const;
+
 	ModelAction * get_last_fence_conflict(ModelAction *act) const;
 	ModelAction * get_last_conflict(ModelAction *act) const;
 	void set_backtracking(ModelAction *act);
-	Thread * get_next_thread(ModelAction *curr);
+	Thread * action_select_next_thread(const ModelAction *curr) const;
+	Thread * get_next_thread();
 	bool set_latest_backtrack(ModelAction *act);
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
-	bool resolve_promises(ModelAction *curr);
+	int get_promise_to_resolve(const ModelAction *curr) const;
+	bool resolve_promise(ModelAction *curr, unsigned int promise_idx);
 	void compute_promises(ModelAction *curr);
 	void compute_relseq_breakwrites(ModelAction *curr);
 
@@ -194,13 +203,13 @@ private:
 	template <typename rf_type>
 	bool r_modification_order(ModelAction *curr, const rf_type *rf);
 
-	bool w_modification_order(ModelAction *curr);
+	bool w_modification_order(ModelAction *curr, std::vector< ModelAction *, ModelAlloc<ModelAction *> > *send_fv);
 	void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
 	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 add_future_value(const ModelAction *writer, ModelAction *reader);
 
-	ModelAction * new_uninitialized_action(void *location) const;
+	ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
 	ModelAction *diverge;
 	ModelAction *earliest_diverge;
@@ -269,6 +278,7 @@ private:
 	bool is_feasible_prefix_ignore_relseq() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;
+	bool is_circular_wait(const Thread *t) const;
 	bool is_complete_execution() const;
 	bool have_bug_reports() const;
 	void print_bugs() const;