X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=execution.h;h=854513cd4b16cc4c6bc74ad0916fe6d108ea6a78;hp=89b3a5a5d20f3e0fc9f32b3b1111fc8eab84719a;hb=4d1d81928c3688fbcfb96ee68eab70e73f7771e5;hpb=a9c4af542eaa752dc356f364f6256c7bee2da5ed

diff --git a/execution.h b/execution.h
index 89b3a5a5..854513cd 100644
--- a/execution.h
+++ b/execution.h
@@ -61,13 +61,12 @@ public:
 
 	ClockVector * get_cv(thread_id_t tid) const;
 	ModelAction * get_parent_action(thread_id_t tid) const;
-	bool isfeasibleprefix() const;
 
 	ModelAction * get_last_action(thread_id_t tid) const;
 
 	bool check_action_enabled(ModelAction *curr);
 
-	bool assert_bug(const char *msg);
+	void assert_bug(const char *msg);
 
 	bool have_bug_reports() const;
 
@@ -77,8 +76,6 @@ public:
 	void set_assert();
 	bool is_complete_execution() const;
 
-	void print_infeasibility(const char *prefix) const;
-	bool is_infeasible() const;
 	bool is_deadlocked() const;
 
 	action_list_t * get_action_trace() { return &action_trace; }
@@ -88,43 +85,29 @@ public:
 	HashTable<pthread_mutex_t *, cdsc::snapmutex *, uintptr_t, 4> * getMutexMap() {return &mutex_map;}
 	ModelAction * check_current_action(ModelAction *curr);
 
-	SnapVector<func_id_list_t> * get_thrd_func_list() { return &thrd_func_list; }
-	SnapVector<uint32_t> * get_thrd_last_entered_func() { return &thrd_last_entered_func; }
-	SnapVector< SnapList<action_list_t *> *> * get_thrd_func_act_lists() { return &thrd_func_act_lists; }
 	bool isFinished() {return isfinished;}
 	void setFinished() {isfinished = true;}
 
 	void restore_last_seq_num();
-
+#ifdef TLS
+	pthread_key_t getPthreadKey() {return pthreadkey;}
+#endif
 	SNAPSHOTALLOC
 private:
 	int get_execution_number() const;
-
-	ModelChecker *model;
-
-	struct model_params * params;
-
-	/** The scheduler to use: tracks the running/ready Threads */
-	Scheduler * const scheduler;
-
 	bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
-	void set_bad_synchronization();
 	bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
 	void wake_up_sleeping_actions(ModelAction *curr);
 	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);
 	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_normal_write_to_lists(ModelAction *act);
 	void add_write_to_lists(ModelAction *act);
@@ -134,28 +117,43 @@ 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 r_modification_order(ModelAction *curr, const ModelAction *rf, SnapVector<const ModelAction *> *priorset, bool *canprune, bool check_only = false);
 	void w_modification_order(ModelAction *curr);
 	ClockVector * get_hb_from_write(ModelAction *rf) const;
-	ModelAction * get_uninitialized_action(ModelAction *curr) const;
 	ModelAction * convertNonAtomicStore(void*);
+	void removeAction(ModelAction *act);
+
+#ifdef TLS
+	pthread_key_t pthreadkey;
+#endif
+	ModelChecker *model;
+	struct model_params * params;
+
+	/** The scheduler to use: tracks the running/ready Threads */
+	Scheduler * const scheduler;
+
 
-	action_list_t action_trace;
 	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;
 
 	/** 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;
 
+	/** 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 *, ModelAction *, uintptr_t, 4> obj_last_sc_map;
@@ -203,20 +201,6 @@ private:
 	Thread * action_select_next_thread(const ModelAction *curr) const;
 	bool paused_by_fuzzer(const ModelAction * act) const;
 
-	/* thrd_func_list stores a list of function ids for each thread.
-	 * Each element in thrd_func_list stores the functions that
-	 * thread i has entered and yet to exit from
-	 *
-	 * This data structure is handled by ModelHistory
-	 */
-	SnapVector<func_id_list_t> thrd_func_list;
-	SnapVector<uint32_t> thrd_last_entered_func;
-
-	/* Keeps track of atomic actions that thread i has performed in some
-	 * function. Index of SnapVector is thread id. SnapList simulates
-	 * the call stack.
-	 */
-	SnapVector< SnapList<action_list_t *> *> thrd_func_act_lists;
 	bool isfinished;
 };