Calculate store visibility probability and change the shift of a few hashtables in...

[c11tester.git] / newfuzzer.h

diff --git a/newfuzzer.h b/newfuzzer.h
index 3071ab32f8a607243333ee1b05acc1b627319630..ea08b74171a3fcae302679aad8182cccc8d05bd0 100644 (file)
--- a/newfuzzer.h
+++ b/newfuzzer.h
@@ -5,7 +5,7 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "stl-model.h"
-#include "predicatetypes.h"
+#include "predicate.h"
 
 struct node_dist_info {
        node_dist_info(thread_id_t tid, FuncNode * node, int distance) : 
@@ -47,9 +47,10 @@ private:
        SnapVector<Predicate *> thrd_selected_child_branch;
        SnapVector< SnapVector<ModelAction *> *> thrd_pruned_writes;
 
+       void check_store_visibility(Predicate * curr_pred, FuncInst * read_inst, inst_act_map_t * inst_act_map, SnapVector<ModelAction *> * rf_set);
+       Predicate * selectBranch(thread_id_t tid, Predicate * curr_pred, FuncInst * read_inst);
        Predicate * get_selected_child_branch(thread_id_t tid);
        bool prune_writes(thread_id_t tid, Predicate * pred, SnapVector<ModelAction *> * rf_set, inst_act_map_t * inst_act_map);
-       Predicate * selectBranch(thread_id_t tid, Predicate * curr_pred, FuncInst * read_inst);
        int choose_index(SnapVector<Predicate *> * branches, uint32_t numerator);
 
        /* The set of Threads put to sleep by NewFuzzer because no writes in rf_set satisfies the selected predicate. Only used by selectWrite.
@@ -65,7 +66,9 @@ private:
        void wake_up_paused_threads(int * threadlist, int * numthreads);
 
        bool find_threads(ModelAction * pending_read);
-       void update_predicate_score(Predicate * predicate, sleep_result_t type);
+       /*-- void update_predicate_score(Predicate * predicate, sleep_result_t type); */
+
+       bool check_predicate_expressions(PredExprSet * pred_expressions, inst_act_map_t * inst_act_map, uint64_t write_val, bool * no_predicate);
 };
 
 #endif /* end of __NEWFUZZER_H__ */