X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=47f5139ba1b82ebe63c804b32945bffd31325bd0;hb=f71cd7c31df98cfc814254da887de9a30c53b31e;hp=cf03f0913c80db12e55fef5d3f91c7e75318c603;hpb=76205f5d9b62f73ea01f7e55765a043a8333a455;p=c11tester.git

diff --git a/model.h b/model.h
index cf03f091..47f5139b 100644
--- a/model.h
+++ b/model.h
@@ -17,12 +17,16 @@
 #include "action.h"
 #include "clockvector.h"
 #include "hashtable.h"
+#include "workqueue.h"
 
 /* Forward declaration */
 class NodeStack;
 class CycleGraph;
 class Promise;
 
+/** @brief Shorthand for a list of release sequence heads */
+typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_heads_list_t;
+
 /**
  * Model checker parameter structure. Holds run-time configuration options for
  * the model checker.
@@ -47,9 +51,6 @@ struct model_snapshot_members {
 	modelclock_t used_sequence_numbers;
 	Thread *nextThread;
 	ModelAction *next_backtrack;
-
-	/** @see ModelChecker::lazy_sync_size */
-	unsigned int lazy_sync_size;
 };
 
 /** @brief The central structure for model-checking */
@@ -84,8 +85,7 @@ public:
 	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);
+	void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
 	void finish_execution();
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
@@ -99,6 +99,7 @@ private:
 	bool has_asserted() {return asserted;}
 	void reset_asserted() {asserted=false;}
 	int num_executions;
+	int num_feasible_executions;
 	bool promises_expired();
 	const model_params params;
 
@@ -110,11 +111,15 @@ 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);
+	void process_mutex(ModelAction *curr);
+	bool check_action_enabled(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);
@@ -125,16 +130,17 @@ private:
 
 	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_action(thread_id_t tid) const;
+	ModelAction * get_last_seq_cst(ModelAction *curr) const;
+	ModelAction * get_last_unlock(ModelAction *curr) const;
 	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);
+	bool release_seq_head(const ModelAction *rf, rel_heads_list_t *release_heads) const;
+	bool resolve_release_sequences(void *location, work_queue_t *work_queue);
+	void do_complete_join(ModelAction *join);
 
 	ModelAction *diverge;
 
@@ -146,26 +152,21 @@ private:
 	 * to a trace of all actions performed on the object. */
 	HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
 
+	/** Per-object list of actions. Maps an object (i.e., memory location)
+	 * to a trace of all actions performed on the object. */
+	HashTable<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
+
 	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
-	 * 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;
-
-	/**
-	 * Represents the total size of the
-	 * ModelChecker::lazy_sync_with_release lists. This count should be
-	 * snapshotted, so it is actually a pointer to a location within
-	 * ModelChecker::priv
+	 * List of acquire actions that might synchronize with one or more
+	 * release sequence. Release sequences might be determined lazily as
+	 * promises are fulfilled and modification orders are established. Each
+	 * ModelAction in this list must be an acquire operation.
 	 */
-	unsigned int *lazy_sync_size;
+	std::vector<ModelAction *> *pending_acq_rel_seq;
 
 	std::vector<ModelAction *> *thrd_last_action;
 	NodeStack *node_stack;