X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=5e80e186e01d95677c11e46d677d437a87b60386;hb=HEAD;hp=008e1e11dd90bf5d2f3109ea6167c97f7fccd115;hpb=1b2222d691a55eb20b39d3804c71aca19f5577bf;p=c11tester.git

diff --git a/execution.h b/execution.h
index 008e1e11..5e80e186 100644
--- a/execution.h
+++ b/execution.h
@@ -19,7 +19,8 @@
 #include <condition_variable>
 #include "classlist.h"
 
-typedef SnapList<ModelAction *> action_list_t;
+#define INITIAL_THREAD_ID	0
+#define MAIN_THREAD_ID		1
 
 struct PendingFutureValue {
 	PendingFutureValue(ModelAction *writer, ModelAction *reader) :
@@ -29,6 +30,10 @@ struct PendingFutureValue {
 	ModelAction *reader;
 };
 
+#ifdef COLLECT_STAT
+void print_atomic_accesses();
+#endif
+
 /** @brief The central structure for model-checking */
 class ModelExecution {
 public:
@@ -41,6 +46,7 @@ public:
 	Thread * take_step(ModelAction *curr);
 
 	void print_summary();
+	void print_tail();
 #if SUPPORT_MOD_ORDER_DUMP
 	void dumpGraph(char *filename);
 #endif
@@ -96,15 +102,14 @@ public:
 	SNAPSHOTALLOC
 private:
 	int get_execution_number() const;
-	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
-	bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
-	void wake_up_sleeping_actions(ModelAction *curr);
+	bool should_wake_up(const ModelAction * asleep) const;
+	void wake_up_sleeping_actions();
 	modelclock_t get_next_seq_num();
 	bool next_execution();
 	bool initialize_curr_action(ModelAction **curr);
 	bool process_read(ModelAction *curr, SnapVector<ModelAction *> * rf_set);
 	void process_write(ModelAction *curr);
-	bool process_fence(ModelAction *curr);
+	void process_fence(ModelAction *curr);
 	bool process_mutex(ModelAction *curr);
 	void process_thread_action(ModelAction *curr);
 	void read_from(ModelAction *act, ModelAction *rf);
@@ -118,7 +123,7 @@ private:
 	ModelAction * get_last_unlock(ModelAction *curr) const;
 	SnapVector<ModelAction *> * build_may_read_from(ModelAction *curr);
 	ModelAction * process_rmw(ModelAction *curr);
-	bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<ModelAction *> *priorset, bool *canprune, bool check_only = false);
+	bool r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<ModelAction *> *priorset, bool *canprune);
 	void w_modification_order(ModelAction *curr);
 	ClockVector * get_hb_from_write(ModelAction *rf) const;
 	ModelAction * convertNonAtomicStore(void*);
@@ -147,17 +152,17 @@ private:
 	 * to a trace of all actions performed on the object.
 	 * Used only for SC fences, unlocks, & wait.
 	 */
-	HashTable<const void *, action_list_t *, uintptr_t, 2> obj_map;
+	HashTable<const void *, simple_action_list_t *, uintptr_t, 2> 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, 2> condvar_waiters_map;
+	HashTable<const void *, simple_action_list_t *, uintptr_t, 2> condvar_waiters_map;
 
 	/** Per-object list of actions that each thread performed. */
 	HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
 
 	/** Per-object list of writes that each thread performed. */
-	HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
+	HashTable<const void *, SnapVector<simple_action_list_t> *, uintptr_t, 2> obj_wr_thrd_map;
 
 	HashTable<const void *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
 
@@ -202,7 +207,6 @@ private:
 	Fuzzer * fuzzer;
 
 	Thread * action_select_next_thread(const ModelAction *curr) const;
-	bool paused_by_fuzzer(const ModelAction * act) const;
 
 	bool isfinished;
 };