X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=classlist.h;h=e74ebcf64bdbb5aace60103095d47dcf09bfd395;hb=7cab9e695d0cfd0e935a6ef100a914aa6f661cc4;hp=24c635fd352d550fabb9f7777172095c43d95b60;hpb=edaaf79d36b5e9de06881591a42b799c5de0f59a;p=c11tester.git

diff --git a/classlist.h b/classlist.h
index 24c635fd..e74ebcf6 100644
--- a/classlist.h
+++ b/classlist.h
@@ -1,6 +1,9 @@
 #ifndef CLASSLIST_H
 #define CLASSLIST_H
+#include <inttypes.h>
 #include "stl-model.h"
+#include "hashset.h"
+#include "modeltypes.h"
 
 class ClockVector;
 class CycleGraph;
@@ -9,16 +12,37 @@ class ModelAction;
 class ModelChecker;
 class ModelExecution;
 class ModelHistory;
-class Node;
-class NodeStack;
 class Scheduler;
 class Thread;
 class TraceAnalysis;
 class Fuzzer;
+class NewFuzzer;
+class FuncNode;
+class FuncInst;
+class Predicate;
+class ConcretePredicate;
+class WaitObj;
+class actionlist;
+
+#include "actionlist.h"
 
 struct model_snapshot_members;
 struct bug_message;
-typedef SnapList<ModelAction *> action_list_t;
 
-extern volatile int forklock;
+typedef SnapList<ModelAction *> simple_action_list_t;
+typedef actionlist action_list_t;
+typedef SnapList<uint32_t> func_id_list_t;
+typedef SnapList<FuncInst *> func_inst_list_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 modellock;
 #endif