initial commit for declaring member functions of Fuzzer as virtual

[c11tester.git] / classlist.h

diff --git a/classlist.h b/classlist.h
index 3aca3e11ceb086a65aef19bf2dec9caf05b90db4..e528a47dc40ca1a3e84eaf30202e8af87debf2be 100644 (file)
--- a/classlist.h
+++ b/classlist.h
@@ -2,6 +2,7 @@
 #define CLASSLIST_H
 #include <inttypes.h>
 #include "stl-model.h"
+#include "hashset.h"
 
 class ClockVector;
 class CycleGraph;
@@ -14,13 +15,24 @@ class Scheduler;
 class Thread;
 class TraceAnalysis;
 class Fuzzer;
+class NewFuzzer;
 class FuncNode;
 class FuncInst;
+class Predicate;
 
 struct model_snapshot_members;
 struct bug_message;
 typedef SnapList<ModelAction *> action_list_t;
 typedef SnapList<uint32_t> func_id_list_t;
+typedef SnapList<FuncInst *> func_inst_list_t;
 
-extern volatile int forklock;
+typedef HashSet<Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> PredSet;
+typedef HSIterator<Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> PredSetIter;
+
+typedef HashSet<uint64_t, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> value_set_t;
+typedef HSIterator<uint64_t, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> value_set_iter;
+typedef HashSet<void *, uintptr_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> loc_set_t;
+typedef HSIterator<void *, uintptr_t, 0, snapshot_malloc, snapshot_calloc, snapshot_free> loc_set_iter;
+
+extern volatile int modellock;
 #endif