model: add obj_thrd_map

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 4718c503f9eac77a106d9505d49aca410b741d5b..a1ab45e7b6534238a74c27750dd66af0d3bb4999 100644 (file)
--- a/model.h
+++ b/model.h
@@ -34,15 +34,17 @@ public:
 
        int add_thread(Thread *t);
        void remove_thread(Thread *t);
-       Thread * get_thread(thread_id_t tid) { return thread_map[id_to_int(tid)]; }
+       Thread * get_thread(thread_id_t tid) { return (*thread_map)[id_to_int(tid)]; }
 
        thread_id_t get_next_id();
+       int get_num_threads();
        int get_next_seq_num();
 
        int switch_to_master(ModelAction *act);
 
        bool next_execution();
-  MEMALLOC
+
+       MEMALLOC
 private:
        int next_thread_id;
        int used_sequence_numbers;
@@ -62,7 +64,8 @@ private:
 
        ucontext_t *system_context;
        action_list_t *action_trace;
-       std::map<int, class Thread *, std::less< int >, MyAlloc< std::pair< const int, class Thread * > > > thread_map;
+       std::map<int, class Thread *> *thread_map;
+       std::map<void *, std::vector<action_list_t> > *obj_thrd_map;
        class NodeStack *node_stack;
        ModelAction *next_backtrack;
 };