Compute the threads that a paused thread my wait for

[c11tester.git] / newfuzzer.h

diff --git a/newfuzzer.h b/newfuzzer.h
index db25cfd8744a8801ba4015de686c7c8199025cf4..0e5d483bea9c96d8e0edff2956ecb2c2ed7f93f9 100644 (file)
--- a/newfuzzer.h
+++ b/newfuzzer.h
@@ -6,16 +6,13 @@
 #include "mymemory.h"
 #include "stl-model.h"
 
-typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
-
 class NewFuzzer : public Fuzzer {
 public:
        NewFuzzer();
        int selectWrite(ModelAction *read, SnapVector<ModelAction *>* rf_set);
        Predicate * get_selected_child_branch(thread_id_t tid);
-       void conditional_sleep(Thread * thread);
        bool has_paused_threads();
-       void wake_up_paused_threads(int * threadlist, int * numthreads);
+       void notify_paused_thread(Thread * thread);
 
        Thread * selectThread(int * threadlist, int numthreads);
        Thread * selectNotify(action_list_t * waiters);
@@ -38,10 +35,15 @@ private:
        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);
 
-       /* 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;
+       HashTable<Thread *, int, uintptr_t, 0> paused_thread_table;
+
+       void conditional_sleep(Thread * thread);
+       void wake_up_paused_threads(int * threadlist, int * numthreads);
+
+       void find_threads(ModelAction * pending_read);
 };
 
 #endif /* end of __NEWFUZZER_H__ */