nodestack: rename 'read_from' to 'read_from_past'

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 6d7b63d13390b22d9320409c01676c3452caeb6b..44def6d67583e1282605de06fbb72dfe4fc3ab6b 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -190,22 +190,25 @@ Thread * Scheduler::select_next_thread()
                thread_id_t tid = int_to_id(i);
                if (n->has_priority(tid)) {
                        DEBUG("Node (tid %d) has priority\n", i);
-                       //Have a thread with priority
                        if (enabled[i] != THREAD_DISABLED)
                                have_enabled_thread_with_priority = true;
                }
        }
 
-       while (true) {
-               curr_thread_index = (curr_thread_index + 1) % enabled_len;
+       for (int i = 0; i < enabled_len; i++) {
+               curr_thread_index = (old_curr_thread + i + 1) % enabled_len;
                thread_id_t curr_tid = int_to_id(curr_thread_index);
                if (enabled[curr_thread_index] == THREAD_ENABLED &&
                                (!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
                        return model->get_thread(curr_tid);
                }
-               if (curr_thread_index == old_curr_thread)
-                       return NULL;
        }
+       /* No thread was enabled */
+       return NULL;
+}
+
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+       curr_thread_index=id_to_int(tid);
 }
 
 /**
@@ -216,8 +219,6 @@ void Scheduler::set_current_thread(Thread *t)
 {
        ASSERT(t && !t->is_model_thread());
 
-       curr_thread_index = id_to_int(t->get_id());
-
        current = t;
        if (DBG_ENABLED())
                print();