X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=a2d33432de948e4bc64b48ca6d7c1c7596f1a20f;hb=ea0cb2585eee658354f48b4bbfebaf030cccf317;hp=8d10d51e7e2138904ae415cf8fa11c06c959765e;hpb=15190694fd79202132be5f6e056fa5c00893664e;p=c11tester.git

diff --git a/model.h b/model.h
index 8d10d51e..a2d33432 100644
--- a/model.h
+++ b/model.h
@@ -18,6 +18,7 @@
 #include "clockvector.h"
 #include "hashtable.h"
 #include "workqueue.h"
+#include "config.h"
 
 /* Forward declaration */
 class NodeStack;
@@ -34,6 +35,8 @@ typedef std::vector< const ModelAction *, MyAlloc<const ModelAction *> > rel_hea
 struct model_params {
 	int maxreads;
 	int maxfuturedelay;
+	unsigned int fairwindow;
+	unsigned int enabledcount;
 };
 
 struct PendingFutureValue {
@@ -51,9 +54,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 */
@@ -67,6 +67,9 @@ public:
 
 	/** Prints an execution summary with trace information. */
 	void print_summary();
+#if SUPPORT_MOD_ORDER_DUMP
+	void dumpGraph(char *filename);
+#endif
 
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
@@ -75,7 +78,6 @@ public:
 
 	thread_id_t get_next_id();
 	int get_num_threads();
-	modelclock_t get_next_seq_num();
 
 	/** @return The currently executing Thread. */
 	Thread * get_current_thread() { return scheduler->get_current_thread(); }
@@ -93,6 +95,12 @@ public:
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
 
+	/** @brief Alert the model-checker that an incorrectly-ordered
+	 * synchronization was made */
+	void set_bad_synchronization() { bad_synchronization = true; }
+
+	const model_params params;
+
 	MEMALLOC
 private:
 	/** The scheduler to use: tracks the running/ready Threads */
@@ -104,7 +112,8 @@ private:
 	int num_executions;
 	int num_feasible_executions;
 	bool promises_expired();
-	const model_params params;
+
+	modelclock_t get_next_seq_num();
 
 	/**
 	 * Stores the ModelAction for the current thread action.  Call this
@@ -117,12 +126,13 @@ private:
 	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 process_mutex(ModelAction *curr);
+	bool process_thread_action(ModelAction *curr);
 	bool check_action_enabled(ModelAction *curr);
 
 	bool take_step();
 
-	void check_recency(ModelAction *curr);
+	void check_recency(ModelAction *curr, const ModelAction *rf);
 	ModelAction * get_last_conflict(ModelAction *act);
 	void set_backtracking(ModelAction *act);
 	Thread * get_next_thread(ModelAction *curr);
@@ -133,9 +143,9 @@ 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(ModelAction *curr);
-	ModelAction * get_last_unlock(ModelAction *curr);
+	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);
@@ -146,6 +156,7 @@ private:
 	void do_complete_join(ModelAction *join);
 
 	ModelAction *diverge;
+	ModelAction *earliest_diverge;
 
 	ucontext_t system_context;
 	action_list_t *action_trace;
@@ -164,21 +175,12 @@ private:
 	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 *, action_list_t, 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;
@@ -205,6 +207,8 @@ private:
 	bool failed_promise;
 	bool too_many_reads;
 	bool asserted;
+	/** @brief Incorrectly-ordered synchronization was made */
+	bool bad_synchronization;
 };
 
 extern ModelChecker *model;