X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=9eb9aa655c0285914c48be1414c17d4061171f64;hb=0accacf66b9f7bb4479205a0840f208dd8da6960;hp=fcdc69fd9cf510fc1681e05c4b0edc346a4b0e31;hpb=1d1a5597f254b812fab97dea48e076b54f53d7e6;p=c11tester.git

diff --git a/model.h b/model.h
index fcdc69fd..9eb9aa65 100644
--- a/model.h
+++ b/model.h
@@ -42,8 +42,6 @@ public:
 	/** Prints an execution summary with trace information. */
 	void print_summary();
 
-	Thread * schedule_next_thread();
-
 	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)); }
@@ -57,10 +55,13 @@ public:
 
 	int switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid);
+	ModelAction * get_parent_action(thread_id_t tid);
 	bool next_execution();
 	bool isfeasible();
 	bool isfinalfeasible();
 	void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
+	void get_release_seq_heads(ModelAction *act,
+	                std::vector<const ModelAction *> *release_heads);
 
 	void finish_execution();
 
@@ -82,31 +83,33 @@ private:
 	 * @param act The ModelAction created by the user-thread action
 	 */
 	void set_current_action(ModelAction *act) { current_action = act; }
-	void check_current_action();
+	Thread * check_current_action(ModelAction *curr);
 
 	bool take_step();
 
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
-	thread_id_t get_next_replay_thread();
+	Thread * get_next_replay_thread();
 	ModelAction * get_next_backtrack();
 	void reset_to_initial_state();
-	void resolve_promises(ModelAction *curr);
+	bool resolve_promises(ModelAction *curr);
 	void compute_promises(ModelAction *curr);
 
 	void add_action_to_lists(ModelAction *act);
 	ModelAction * get_last_action(thread_id_t tid);
-	ModelAction * get_parent_action(thread_id_t tid);
 	ModelAction * get_last_seq_cst(const void *location);
 	void build_reads_from_past(ModelAction *curr);
-	ModelAction * process_rmw(ModelAction * curr);
-	void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
-	void r_modification_order(ModelAction * curr, const ModelAction *rf);
-	void w_modification_order(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);
 
 	ModelAction *current_action;
 	ModelAction *diverge;
-	thread_id_t nextThread;
+	Thread *nextThread;
 
 	ucontext_t system_context;
 	action_list_t *action_trace;
@@ -117,7 +120,17 @@ private:
 	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
 
 	HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
-	std::vector<Promise *> * promises;
+	std::vector<Promise *> *promises;
+
+	/**
+	 * Collection of lists of objects that might synchronize with one or
+	 * more release sequence. Release sequences might be determined lazily
+	 * as promises are fulfilled and modification orders are established.
+	 * This structure maps its lists by object location. Each ModelAction
+	 * in the lists should be an acquire operation.
+	 */
+	HashTable<void *, std::list<ModelAction *>, uintptr_t, 4> *lazy_sync_with_release;
+
 	std::vector<ModelAction *> *thrd_last_action;
 	NodeStack *node_stack;
 	ModelAction *next_backtrack;
@@ -132,10 +145,9 @@ private:
 	 * disjoint (unconnected) subgraphs, each graph corresponding to a
 	 * separate ordering on a distinct object.
 	 *
-	 * Note that the edges in this graph actually represent the "ordered
-	 * after" relation, such that <tt>a --> b</tt> means <tt>a</tt> was
-	 * ordered after <tt>b</tt>, or in the traditional sense of
-	 * modification order, <tt>b --mo--> a</tt>.
+	 * The edges in this graph represent the "ordered before" relation,
+	 * such that <tt>a --> b</tt> means <tt>a</tt> was ordered before
+	 * <tt>b</tt>.
 	 */
 	CycleGraph *mo_graph;