Adding STL stuff and operator news of snapshot to model-checker. Need to actuallly...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index c8b3f762035751ed66c6d4bd772c9066a3bc2183..8614563abd16314098c3a621cb7b73e54baede12 100644 (file)
--- a/model.h
+++ b/model.h
@@ -7,6 +7,8 @@
 #include <ucontext.h>
 
 #include "schedule.h"
+#include "mymemory.h"
+#include <utility>
 #include "libthreads.h"
 #include "libatomic.h"
 #include "threads.h"
@@ -40,6 +42,7 @@ public:
        int switch_to_master(ModelAction *act);
 
        bool next_execution();
+  MEMALLOC
 private:
        int next_thread_id;
        int used_sequence_numbers;
@@ -60,9 +63,9 @@ private:
 
        ucontext_t *system_context;
        action_list_t *action_trace;
-       std::map<int, class Thread *> thread_map;
+       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
        class TreeNode *rootNode, *currentNode;
-       std::list<class Backtrack *> backtrack_list;
+       std::list<class Backtrack *, MyAlloc< class Backtrack * > > backtrack_list;
 };
 
 extern ModelChecker *model;