promise: add max_available_thread_idx() interface

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 48fa28acb71cf1b8d49112df717d2ac460dc2e9b..8e94561531ca063ccbd23bec2bf51d778530a95d 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -16,8 +16,6 @@
 #include "execution.h"
 #include "bugmessage.h"
 
-#define INITIAL_THREAD_ID      0
-
 ModelChecker *model;
 
 /** @brief Constructor */
@@ -26,7 +24,8 @@ ModelChecker::ModelChecker(struct model_params params) :
        params(params),
        scheduler(new Scheduler()),
        node_stack(new NodeStack()),
-       execution(new ModelExecution(&params, scheduler, node_stack)),
+       execution(new ModelExecution(this, &params, scheduler, node_stack)),
+       execution_number(1),
        diverge(NULL),
        earliest_diverge(NULL),
        trace_analyses()
@@ -319,7 +318,8 @@ bool ModelChecker::next_execution()
                diverge->print();
        }
 
-       execution->increment_execution_number();
+       execution_number++;
+
        reset_to_initial_state();
        return true;
 }