repush changes

diff --git a/model.cc b/model.cc
index cec59d52a5579ba651ec2f97cacd689d87da34fe..24eb83dbbc6515cb4c24730e27ee94c4c949afbe 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -282,6 +282,8 @@ Thread * ModelChecker::get_next_thread(ModelAction *curr)
                                earliest_diverge = prevnode->get_action();
                        }
                }
+               /* Start the round robin scheduler from this thread id */
+               scheduler->set_scheduler_thread(tid);
                /* The correct sleep set is in the parent node. */
                execute_sleep_set();
 

diff --git a/schedule.cc b/schedule.cc
index 8dd13304093008094c00d465ffb4086eec1e810d..1bd1b0f983fef2a602fe6b089db723c4526adc4a 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -207,6 +207,10 @@ Thread * Scheduler::select_next_thread()
        return NULL;
 }
 
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+       curr_thread_index=id_to_int(tid);
+}
+
 /**
  * @brief Set the current "running" Thread
  * @param t Thread to run

diff --git a/schedule.h b/schedule.h
index 121da08db05a3d0d735c4ca34926006b364c85cb..0865310a27ed4509b3646e003aa015eeb141f00a 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -39,6 +39,7 @@ public:
        bool is_enabled(const Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
        bool is_sleep_set(const Thread *t) const;
+       void set_scheduler_thread(thread_id_t tid);
 
        SNAPSHOTALLOC
 private: