From: Brian Norris <banorris@uci.edu>
Date: Fri, 15 Feb 2013 23:53:13 +0000 (-0800)
Subject: schedule: simplify Scheduler::select_next_thread()
X-Git-Tag: oopsla2013~247
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1857316e6637ac144952a274ff020629abe83807;p=model-checker.git

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().
---

diff --git a/schedule.cc b/schedule.cc
index d49e62b..6d7b63d 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;
-		}
 	}
 }