model: number threads from 0, not 1

diff --git a/model.cc b/model.cc
index c3452b07e5e7c502384ddfd2c8a0c981be2bf620..c829312166033342c8c8d077f0ec2acd63c33230 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -12,8 +12,8 @@ ModelChecker *model;
 
 ModelChecker::ModelChecker()
 {
-       /* First thread created will have id (INITIAL_THREAD_ID + 1) */
-       this->used_thread_id = INITIAL_THREAD_ID;
+       /* First thread created will have id INITIAL_THREAD_ID */
+       this->next_thread_id = INITIAL_THREAD_ID;
        used_sequence_numbers = 0;
        /* Initialize default scheduler */
        this->scheduler = new Scheduler();
@@ -45,14 +45,14 @@ void ModelChecker::reset_to_initial_state()
        action_trace = new action_list_t();
        currentNode = rootNode;
        current_action = NULL;
-       used_thread_id = INITIAL_THREAD_ID;
+       next_thread_id = INITIAL_THREAD_ID;
        used_sequence_numbers = 0;
        /* scheduler reset ? */
 }
 
 thread_id_t ModelChecker::get_next_id()
 {
-       return ++used_thread_id;
+       return next_thread_id++;
 }
 
 int ModelChecker::get_next_seq_num()

diff --git a/model.h b/model.h
index ebb9211fb227c28e27ba075af04e14f34e9aaf59..033bde21c0611e3fccbe6343655d17fc25d7ae21 100644 (file)
--- a/model.h
+++ b/model.h
@@ -60,7 +60,7 @@ public:
 
        bool next_execution();
 private:
-       int used_thread_id;
+       int next_thread_id;
        int used_sequence_numbers;
        int num_executions;