Edits

[c11tester.git] / newfuzzer.h

diff --git a/newfuzzer.h b/newfuzzer.h
index ecab8f216f96443734b732eff6165e79f57d56cd..45a7e8bbe91f44f867e22958502491ffb64b4fa6 100644 (file)
--- a/newfuzzer.h
+++ b/newfuzzer.h
@@ -5,7 +5,21 @@
 #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) :
+               tid(tid),
+               target(node),
+               dist(distance)
+       {}
+
+       thread_id_t tid;
+       FuncNode * target;
+       int dist;
+
+       SNAPSHOTALLOC
+};
 
 class NewFuzzer : public Fuzzer {
 public:
@@ -20,7 +34,8 @@ public:
        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:
@@ -30,26 +45,26 @@ private:
        SnapVector<ModelAction *> thrd_last_read_act;
        SnapVector<FuncInst *> thrd_last_func_inst;
 
+       SnapVector<Predicate *> available_branches_tmp_storage;
        SnapVector<Predicate *> thrd_selected_child_branch;
        SnapVector< SnapVector<ModelAction *> *> thrd_pruned_writes;
 
-       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);
+       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);
-       int choose_index(SnapVector<Predicate *> * branches, uint32_t numerator);
+       bool prune_writes(thread_id_t tid, Predicate * pred, SnapVector<ModelAction *> * rf_set);
+       int choose_branch_index(SnapVector<Predicate *> * branches);
 
        /* 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_list;
-       HashTable<Thread *, int, uintptr_t, 0> paused_thread_table;
-       HashTable<Predicate *, bool, uintptr_t, 0> failed_predicates;
+       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);
-       bool should_conditional_sleep(Predicate * predicate);
-       void wake_up_paused_threads(int * threadlist, int * numthreads);
+       void conditional_sleep(Thread * thread);        //--
+       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);
+       bool find_threads(ModelAction * pending_read);  //--
 };
 
-#endif /* end of __NEWFUZZER_H__ */
+#endif /* end of __NEWFUZZER_H__ */