Fix

[c11tester.git] / newfuzzer.h

diff --git a/newfuzzer.h b/newfuzzer.h
index f50c47651fa01ded23ec65db13d951edf2e543c0..ecab8f216f96443734b732eff6165e79f57d56cd 100644 (file)
--- a/newfuzzer.h
+++ b/newfuzzer.h
@@ -5,22 +5,51 @@
 #include "classlist.h"
 #include "mymemory.h"
 #include "stl-model.h"
+#include "predicatetypes.h"
 
 class NewFuzzer : public Fuzzer {
 public:
-       NewFuzzer() {}
+       NewFuzzer();
        int selectWrite(ModelAction *read, SnapVector<ModelAction *>* rf_set);
+       bool has_paused_threads();
+       void notify_paused_thread(Thread * thread);
+
        Thread * selectThread(int * threadlist, int numthreads);
        Thread * selectNotify(action_list_t * waiters);
-       bool shouldSleep(const ModelAction *sleep);
-       bool shouldWake(const ModelAction *sleep);
+       bool shouldSleep(const ModelAction * sleep);
+       bool shouldWake(const ModelAction * sleep);
+       bool shouldWait(const ModelAction * wait);
 
        void register_engine(ModelHistory * history, ModelExecution * execution);
 
-       MEMALLOC
+       SNAPSHOTALLOC
 private:
        ModelHistory * history;
        ModelExecution * execution;
+
+       SnapVector<ModelAction *> thrd_last_read_act;
+       SnapVector<FuncInst *> thrd_last_func_inst;
+
+       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);
+       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.
+        */
+       SnapVector<Thread *> paused_thread_list;
+       HashTable<Thread *, int, uintptr_t, 0> paused_thread_table;
+       HashTable<Predicate *, bool, uintptr_t, 0> failed_predicates;
+
+       void conditional_sleep(Thread * thread);
+       bool should_conditional_sleep(Predicate * predicate);
+       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);
 };
 
 #endif /* end of __NEWFUZZER_H__ */