X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=newfuzzer.h;h=26fab3f6c2fff4e0ed995e4d68a8dd7733ecb5f5;hp=d6fa3a4fba861915d0e6cd87e615405d38898158;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=70acabc306bc3014b3698e394908faf23a66a0b8

diff --git a/newfuzzer.h b/newfuzzer.h
index d6fa3a4f..26fab3f6 100644
--- a/newfuzzer.h
+++ b/newfuzzer.h
@@ -5,21 +5,37 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "stl-model.h"
+#include "predicate.h"
+
+struct node_dist_info {
+	node_dist_info(thread_id_t tid, FuncNode * node, int distance) :
+		tid(tid),
+		target(node),
+		dist(distance)
+	{}
+
+	thread_id_t tid;
+	FuncNode * target;
+	int dist;
+
+	SNAPSHOTALLOC
+};
 
 class NewFuzzer : public Fuzzer {
 public:
 	NewFuzzer();
 	int selectWrite(ModelAction *read, SnapVector<ModelAction *>* rf_set);
-	Predicate * get_selected_child_branch(thread_id_t tid);
 	bool has_paused_threads();
+	void notify_paused_thread(Thread * thread);
 
 	Thread * selectThread(int * threadlist, int numthreads);
-	Thread * selectNotify(action_list_t * waiters);
+	Thread * selectNotify(simple_action_list_t * waiters);
 	bool shouldSleep(const ModelAction * sleep);
 	bool shouldWake(const ModelAction * sleep);
 	bool shouldWait(const ModelAction * wait);
 
-	void register_engine(ModelHistory * history, ModelExecution * execution);
+	void register_engine(ModelChecker * model, ModelExecution * execution);
+	Predicate * get_selected_child_branch(thread_id_t tid);
 
 	SNAPSHOTALLOC
 private:
@@ -27,21 +43,28 @@ private:
 	ModelExecution * execution;
 
 	SnapVector<ModelAction *> thrd_last_read_act;
-	SnapVector<Predicate *> thrd_curr_pred;
+	SnapVector<FuncInst *> thrd_last_func_inst;
+
+	SnapVector<Predicate *> available_branches_tmp_storage;
 	SnapVector<Predicate *> thrd_selected_child_branch;
 	SnapVector< SnapVector<ModelAction *> *> thrd_pruned_writes;
 
-	bool prune_writes(thread_id_t tid, Predicate * pred, SnapVector<ModelAction *> * rf_set, inst_act_map_t * inst_act_map);
+	bool check_branch_inst(Predicate * curr_pred, FuncInst * read_inst, SnapVector<ModelAction *> * rf_set);
 	Predicate * selectBranch(thread_id_t tid, Predicate * curr_pred, FuncInst * read_inst);
+	bool prune_writes(thread_id_t tid, Predicate * pred, SnapVector<ModelAction *> * rf_set);
+	int choose_branch_index(SnapVector<Predicate *> * branches);
 
-	/* Threads put to sleep by NewFuzzer because no writes in rf_set satisfies the selected predicate.
-	 * Only used by selectWrite;
+	/* The set of Threads put to sleep by NewFuzzer because no writes in rf_set satisfies the selected predicate. Only used by selectWrite.
 	 */
-	SnapVector<Thread *> paused_thread_set;
+	SnapVector<Thread *> paused_thread_list;	//-- (not in use)
+	HashTable<Thread *, int, uintptr_t, 0> paused_thread_table;	//--
+
+	SnapVector<struct node_dist_info> dist_info_vec;	//--
+
+	void conditional_sleep(Thread * thread);	//--
+	void wake_up_paused_threads(int * threadlist, int * numthreads);	//--
 
-	void conditional_sleep(Thread * thread);
-	void wake_up_paused_threads(int * threadlist, int * numthreads);
-	bool notify_conditional_sleep(Thread * thread);
+	bool find_threads(ModelAction * pending_read);	//--
 };
 
-#endif /* end of __NEWFUZZER_H__ */
+#endif	/* end of __NEWFUZZER_H__ */