main, model: move main execution loop into ModelChecker class

diff --git a/main.cc b/main.cc
index 9a6c2d8fcadd5e9127a56082f48a682ce0d803c3..6f1483b7decbcebb809c6469489b2815a0965516 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -12,52 +12,6 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-/**
- * The thread_system_next function takes the next step in the execution, if
- * possible.
- * @return Returns 0 (success) if there is another step and non-zero otherwise.
- */
-static int thread_system_next(void) {
-       Thread *curr, *next;
-
-       curr = thread_current();
-       if (curr) {
-               if (curr->get_state() == THREAD_READY) {
-                       model->check_current_action();
-                       model->scheduler->add_thread(curr);
-               } else if (curr->get_state() == THREAD_RUNNING) {
-                       /* Stopped while running; i.e., completed */
-                       curr->complete();
-               } else {
-                       ASSERT(false);
-               }
-       }
-       next = model->scheduler->next_thread();
-
-       /* Infeasible -> don't take any more steps */
-       if (!model->isfeasible())
-               return 1;
-
-       if (next)
-               next->set_state(THREAD_RUNNING);
-       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-
-       /* next == NULL -> don't take any more steps */
-       if (!next)
-               return 1;
-       /* Return non-zero only if swap fails with an error */
-       return Thread::swap(model->get_system_context(), next);
-}
-
-/** The thread_wait_finish method runs the current execution until we
- *  have no more steps to take.
- */
-static void thread_wait_finish(void) {
-       DBG();
-
-       while (!thread_system_next());
-}
-
 static void parse_options(struct model_params *params, int argc, char **argv) {
 }
 
@@ -91,7 +45,7 @@ static void real_main() {
                model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
 
                /* Wait for all threads to complete */
-               thread_wait_finish();
+               model->finish_execution();
        } while (model->next_execution());
 
        delete model;

diff --git a/model.cc b/model.cc
index c4ee253b9f8fd68bd151057ebc61353702e442c6..964e83fbd623270628ec1b078b2e9d81c9d136c0 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -747,3 +747,46 @@ int ModelChecker::switch_to_master(ModelAction *act)
        old->set_state(THREAD_READY);
        return Thread::swap(old, get_system_context());
 }
+
+/**
+ * Takes the next step in the execution, if possible.
+ * @return Returns true (success) if a step was taken and false otherwise.
+ */
+bool ModelChecker::take_step() {
+       Thread *curr, *next;
+
+       curr = thread_current();
+       if (curr) {
+               if (curr->get_state() == THREAD_READY) {
+                       check_current_action();
+                       scheduler->add_thread(curr);
+               } else if (curr->get_state() == THREAD_RUNNING) {
+                       /* Stopped while running; i.e., completed */
+                       curr->complete();
+               } else {
+                       ASSERT(false);
+               }
+       }
+       next = scheduler->next_thread();
+
+       /* Infeasible -> don't take any more steps */
+       if (!isfeasible())
+               return false;
+
+       if (next)
+               next->set_state(THREAD_RUNNING);
+       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
+
+       /* next == NULL -> don't take any more steps */
+       if (!next)
+               return false;
+       /* Return false only if swap fails with an error */
+       return (Thread::swap(get_system_context(), next) == 0);
+}
+
+/** Runs the current execution until threre are no more steps to take. */
+void ModelChecker::finish_execution() {
+       DBG();
+
+       while (take_step());
+}

diff --git a/model.h b/model.h
index dc6ef6add21045042ed42a29882e3ad9a38ac34e..2b878b3f3ae71b475db5466c27b2c817b1118506 100644 (file)
--- a/model.h
+++ b/model.h
@@ -70,6 +70,8 @@ public:
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
+       void finish_execution();
+
        MEMALLOC
 private:
        int next_thread_id;
@@ -86,6 +88,8 @@ private:
         */
        void set_current_action(ModelAction *act) { current_action = act; }
 
+       bool take_step();
+
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        thread_id_t get_next_replay_thread();