X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=execution.h;h=31e9810ef40149fdd2003cc6fd78744cf9675b14;hp=e25a72e9b697401b60dd5951aa7ef96cc0e390b6;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=da918c450a8fb8524ed99da0a35a7e417eb85777

diff --git a/execution.h b/execution.h
index e25a72e9..31e9810e 100644
--- a/execution.h
+++ b/execution.h
@@ -19,8 +19,6 @@
 #include <condition_variable>
 #include "classlist.h"
 
-typedef SnapList<ModelAction *> action_list_t;
-
 struct PendingFutureValue {
 	PendingFutureValue(ModelAction *writer, ModelAction *reader) :
 		writer(writer), reader(reader)
@@ -29,6 +27,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 +43,7 @@ public:
 	Thread * take_step(ModelAction *curr);
 
 	void print_summary();
+	void print_tail();
 #if SUPPORT_MOD_ORDER_DUMP
 	void dumpGraph(char *filename);
 #endif
@@ -87,15 +90,15 @@ public:
 
 	bool isFinished() {return isfinished;}
 	void setFinished() {isfinished = true;}
-
 	void restore_last_seq_num();
+	void collectActions();
+	modelclock_t get_curr_seq_num();
 #ifdef TLS
 	pthread_key_t getPthreadKey() {return pthreadkey;}
 #endif
 	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);
 	modelclock_t get_next_seq_num();
@@ -103,13 +106,12 @@ private:
 	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);
 	bool synchronize(const ModelAction *first, ModelAction *second);
-	void add_uninit_action_to_lists(ModelAction *act);
-	void add_action_to_lists(ModelAction *act);
+	void add_action_to_lists(ModelAction *act, bool canprune);
 	void add_normal_write_to_lists(ModelAction *act);
 	void add_write_to_lists(ModelAction *act);
 	ModelAction * get_last_fence_release(thread_id_t tid) const;
@@ -118,11 +120,13 @@ 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<const 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 * get_uninitialized_action(ModelAction *curr) const;
 	ModelAction * convertNonAtomicStore(void*);
+	ClockVector * computeMinimalCV();
+	void removeAction(ModelAction *act);
+	void fixupLastAct(ModelAction *act);
 
 #ifdef TLS
 	pthread_key_t pthreadkey;
@@ -133,27 +137,29 @@ private:
 	/** The scheduler to use: tracks the running/ready Threads */
 	Scheduler * const scheduler;
 
+
 	SnapVector<Thread *> thread_map;
 	SnapVector<Thread *> pthread_map;
 	uint32_t pthread_counter;
 
 	action_list_t action_trace;
 
+
 	/** Per-object list of actions. Maps an object (i.e., memory location)
-	 * to a trace of all actions performed on the object. 
+	 * 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;
 
@@ -198,7 +204,6 @@ private:
 	Fuzzer * fuzzer;
 
 	Thread * action_select_next_thread(const ModelAction *curr) const;
-	bool paused_by_fuzzer(const ModelAction * act) const;
 
 	bool isfinished;
 };