X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=71b8b7ac0b97b2dcf4990de667f2418f29c41d94;hb=7ee05d0cce29addaf73326e0eeac08bc7eb39e79;hp=ee9d2c71280175e4dfe0380380b0839cfaa599f5;hpb=0b3c8355b0f1fdf7e4b983bef11472192405a9d9;p=model-checker.git

diff --git a/model.h b/model.h
index ee9d2c7..71b8b7a 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;
@@ -126,7 +128,6 @@ public:
 	ClockVector * get_cv(thread_id_t tid) const;
 	ModelAction * get_parent_action(thread_id_t tid) const;
 	void check_promises_thread_disabled();
-	void mo_check_promises(const ModelAction *act, bool is_read_check);
 	void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
 	bool isfeasibleprefix() const;
 
@@ -156,7 +157,7 @@ private:
 	bool next_execution();
 	ModelAction * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
-	bool process_read(ModelAction *curr, bool second_part_of_rmw);
+	bool process_read(ModelAction *curr);
 	bool process_write(ModelAction *curr);
 	bool process_fence(ModelAction *curr);
 	bool process_mutex(ModelAction *curr);
@@ -167,18 +168,28 @@ 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);
 
+	void mo_check_promises(const ModelAction *act, bool is_read_check);
+	void thread_blocking_check_promises(Thread *blocker, Thread *waiting);
+
 	void check_curr_backtracking(ModelAction *curr);
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid) const;
@@ -192,7 +203,7 @@ 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);
@@ -267,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;