X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=classlist.h;h=bebbf39fa0cd7e1770e2033377fa55f500f63be3;hp=d3d9d3d2c0f2389ae7214f9a0527585c06deb2a5;hb=443de938403221d2b1aaddfdb561fb837745cf86;hpb=ef2b0f89a0dfa8ed3ebf1aaa683a1c24e6a26939

diff --git a/classlist.h b/classlist.h
index d3d9d3d2..bebbf39f 100644
--- a/classlist.h
+++ b/classlist.h
@@ -2,6 +2,8 @@
 #define CLASSLIST_H
 #include <inttypes.h>
 #include "stl-model.h"
+#include "hashset.h"
+#include "modeltypes.h"
 
 class ClockVector;
 class CycleGraph;
@@ -14,14 +16,30 @@ class Scheduler;
 class Thread;
 class TraceAnalysis;
 class Fuzzer;
+class NewFuzzer;
 class FuncNode;
 class FuncInst;
+class Predicate;
+class ConcretePredicate;
+class WaitObj;
 
 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;
+typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
+
+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;
+typedef HashSet<thread_id_t, int, 0> thrd_id_set_t;
+typedef HSIterator<thread_id_t, int, 0> thrd_id_set_iter;
 
-extern volatile int forklock;
+extern volatile int modellock;
 #endif