model: add get_num_threads()

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 09ee4b4a91d07e2667738a0867782061ed97fb97..24c46b689272d22a61a3c82561dc68bbfa39a383 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -46,19 +46,13 @@ ModelChecker::~ModelChecker()
 void ModelChecker::reset_to_initial_state()
 {
        DEBUG("+++ Resetting to initial state +++\n");
-       std::map<int, class Thread *>::iterator it;
-       for (it = thread_map->begin(); it != thread_map->end(); it++)
-               delete (*it).second;
-       thread_map->clear();
-       delete action_trace;
-       action_trace = new action_list_t();
        node_stack->reset_execution();
        current_action = NULL;
        next_thread_id = INITIAL_THREAD_ID;
        used_sequence_numbers = 0;
        nextThread = 0;
        next_backtrack = NULL;
-       /* scheduler reset ? */
+       snapshotObject->backTrackBeforeStep(0);
 }
 
 thread_id_t ModelChecker::get_next_id()
@@ -66,6 +60,11 @@ thread_id_t ModelChecker::get_next_id()
        return next_thread_id++;
 }
 
+int ModelChecker::get_num_threads()
+{
+       return next_thread_id;
+}
+
 int ModelChecker::get_next_seq_num()
 {
        return ++used_sequence_numbers;