X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=0701d467d21f12eeedcad6e88787103b33966e97;hb=c7f10b7c489c0c186bfe34dd1d87ae8b89d501ff;hp=fd6e6c234f1c4d55e9a9a17ac652484f28be53b2;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb;p=model-checker.git

diff --git a/model.h b/model.h
index fd6e6c2..0701d46 100644
--- a/model.h
+++ b/model.h
@@ -34,6 +34,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 {
@@ -92,6 +94,7 @@ public:
 	void finish_execution();
 	bool isfeasibleprefix();
 	void set_assert() {asserted=true;}
+	const model_params params;
 
 	MEMALLOC
 private:
@@ -104,7 +107,6 @@ private:
 	int num_executions;
 	int num_feasible_executions;
 	bool promises_expired();
-	const model_params params;
 
 	/**
 	 * Stores the ModelAction for the current thread action.  Call this
@@ -117,6 +119,8 @@ 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 check_action_enabled(ModelAction *curr);
 
 	bool take_step();
 
@@ -131,8 +135,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_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);
@@ -152,6 +157,10 @@ 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;