X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=model.h;h=8e57876dabf3950e9cd3378eb15d50085a044d73;hp=47f5139ba1b82ebe63c804b32945bffd31325bd0;hb=822674ef74d355637bc3ab2dda6fb63322a1f367;hpb=f71cd7c31df98cfc814254da887de9a30c53b31e

diff --git a/model.h b/model.h
index 47f5139..8e57876 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;
@@ -25,7 +26,7 @@ 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;
+typedef std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > rel_heads_list_t;
 
 /**
  * Model checker parameter structure. Holds run-time configuration options for
@@ -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 {
@@ -64,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);
@@ -72,10 +78,7 @@ 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(); }
+	Thread * get_current_thread();
 
 	int switch_to_master(ModelAction *act);
 	ClockVector * get_cv(thread_id_t tid);
@@ -90,6 +93,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 */
@@ -101,7 +110,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
@@ -114,12 +124,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);
@@ -143,6 +154,7 @@ private:
 	void do_complete_join(ModelAction *join);
 
 	ModelAction *diverge;
+	ModelAction *earliest_diverge;
 
 	ucontext_t system_context;
 	action_list_t *action_trace;
@@ -193,6 +205,8 @@ private:
 	bool failed_promise;
 	bool too_many_reads;
 	bool asserted;
+	/** @brief Incorrectly-ordered synchronization was made */
+	bool bad_synchronization;
 };
 
 extern ModelChecker *model;