From 1857316e6637ac144952a274ff020629abe83807 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 15 Feb 2013 15:53:13 -0800 Subject: [PATCH] schedule: simplify Scheduler::select_next_thread() Now that the "select next thread" vs. "set_current_thread" is clear, we don't actually need to set the value of 'current' in select_next_thread(). --- schedule.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/schedule.cc b/schedule.cc index d49e62ba..6d7b63d1 100644 --- a/schedule.cc +++ b/schedule.cc @@ -177,9 +177,7 @@ void Scheduler::wake(Thread *t) } /** - * Select a Thread to run and set it as the 'current' Thread. This - * implementation defaults to round-robin - * + * @brief Select a Thread to run via round-robin * @return The next Thread to run */ Thread * Scheduler::select_next_thread() @@ -203,16 +201,10 @@ Thread * Scheduler::select_next_thread() 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))) { - current = model->get_thread(curr_tid); - if (DBG_ENABLED()) - print(); - return current; + return model->get_thread(curr_tid); } - if (curr_thread_index == old_curr_thread) { - if (DBG_ENABLED()) - print(); + if (curr_thread_index == old_curr_thread) return NULL; - } } } -- 2.34.1