X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=execution.h;h=3635657edc762879faefcfdd6c63895abec64c45;hp=67e3fa4b8957a50a90211493772d7583678d0bb7;hb=88fb5522811e0bd481ad3e60b70fe40fbc9c3e0f;hpb=c5703c61b49d29d3f56fdcb06847f2aa811eeb4e

diff --git a/execution.h b/execution.h
index 67e3fa4..3635657 100644
--- a/execution.h
+++ b/execution.h
@@ -61,11 +61,13 @@ struct release_seq {
 class ModelExecution {
 public:
 	ModelExecution(ModelChecker *m,
-			struct model_params *params,
+			const struct model_params *params,
 			Scheduler *scheduler,
 			NodeStack *node_stack);
 	~ModelExecution();
 
+	const struct model_params * get_params() const { return params; }
+
 	Thread * take_step(ModelAction *curr);
 	void fixup_release_sequences();
 
@@ -107,6 +109,7 @@ public:
 	bool is_feasible_prefix_ignore_relseq() const;
 	bool is_infeasible() const;
 	bool is_deadlocked() const;
+	bool is_yieldblocked() const;
 	bool too_many_steps() const;
 
 	ModelAction * get_next_backtrack();
@@ -129,6 +132,7 @@ private:
 	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
 	bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
 	void set_bad_synchronization();
+	void set_bad_sc_read();
 	bool promises_expired() const;
 	bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
 	void wake_up_sleeping_actions(ModelAction *curr);
@@ -138,7 +142,7 @@ private:
 	ModelAction * check_current_action(ModelAction *curr);
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr);
-	bool process_write(ModelAction *curr);
+	bool process_write(ModelAction *curr, work_queue_t *work);
 	bool process_fence(ModelAction *curr);
 	bool process_mutex(ModelAction *curr);
 	bool process_thread_action(ModelAction *curr);
@@ -157,7 +161,8 @@ private:
 	void set_backtracking(ModelAction *act);
 	bool set_latest_backtrack(ModelAction *act);
 	Promise * pop_promise_to_resolve(const ModelAction *curr);
-	bool resolve_promise(ModelAction *curr, Promise *promise);
+	bool resolve_promise(ModelAction *curr, Promise *promise,
+			work_queue_t *work);
 	void compute_promises(ModelAction *curr);
 	void compute_relseq_breakwrites(ModelAction *curr);
 
@@ -180,9 +185,10 @@ private:
 	bool w_modification_order(ModelAction *curr, ModelVector<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;
+	void propagate_clockvector(ModelAction *acquire, work_queue_t *work);
 	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
 	void add_future_value(const ModelAction *writer, ModelAction *reader);
-
+	bool check_coherence_promise(const ModelAction *write, const ModelAction *read);
 	ModelAction * get_uninitialized_action(const ModelAction *curr) const;
 
 	action_list_t action_trace;
@@ -197,6 +203,13 @@ private:
 	HashTable<const void *, action_list_t *, uintptr_t, 4> condvar_waiters_map;
 
 	HashTable<void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+
+	/**
+	 * @brief List of currently-pending promises
+	 *
+	 * Promises are sorted by the execution order of the read(s) which
+	 * created them
+	 */
 	SnapVector<Promise *> promises;
 	SnapVector<struct PendingFutureValue> futurevalues;