X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=execution.h;h=a8ab02cc8bad2c548f7cf071095898034f63b581;hb=c335c989221c8d995d27c83077c6f769318c9d36;hp=da3544ab210332c4bb10dbb08c5cb4e4b68c36c2;hpb=eed2c95c816686f295d6baa6743f74d9265b40c2;p=c11tester.git

diff --git a/execution.h b/execution.h
index da3544ab..a8ab02cc 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; }
@@ -89,14 +86,20 @@ public:
 	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:
+#ifdef TLS
+	pthread_key_t pthreadkey;
+#endif
 	int get_execution_number() const;
 
 	ModelChecker *model;
@@ -107,7 +110,6 @@ private:
 	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();
@@ -134,7 +136,7 @@ private:
 	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;
@@ -147,15 +149,15 @@ private:
 
 	/** 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> obj_map;
+	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, 4> condvar_waiters_map;
+	HashTable<const void *, action_list_t *, uintptr_t, 2> condvar_waiters_map;
 
-	HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_thrd_map;
+	HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 2> obj_thrd_map;
 
-	HashTable<const void *, SnapVector<action_list_t> *, uintptr_t, 4> obj_wr_thrd_map;
+	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;
 
@@ -200,6 +202,7 @@ private:
 	Fuzzer * fuzzer;
 
 	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
@@ -208,6 +211,7 @@ private:
 	 * 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