X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=classlist.h;h=e74ebcf64bdbb5aace60103095d47dcf09bfd395;hp=4cd97b3753e1075094de848f59a041c288748bd9;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=0a4d633bc8a0f700621ec57104267d66e5165f35

diff --git a/classlist.h b/classlist.h
index 4cd97b37..e74ebcf6 100644
--- a/classlist.h
+++ b/classlist.h
@@ -3,6 +3,7 @@
 #include <inttypes.h>
 #include "stl-model.h"
 #include "hashset.h"
+#include "modeltypes.h"
 
 class ClockVector;
 class CycleGraph;
@@ -20,13 +21,18 @@ 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;
+
+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 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;
@@ -35,6 +41,8 @@ typedef HashSet<uint64_t, uint64_t, 0, snapshot_malloc, snapshot_calloc, snapsho
 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