}
/**
- * Remove one Thread from the scheduler. This implementation performs FIFO.
+ * Remove one Thread from the scheduler. This implementation defaults to FIFO,
+ * if a thread is not already provided.
+ *
+ * @param t Thread to run, if chosen by an external entity (e.g.,
+ * ModelChecker). May be NULL to indicate no external choice.
* @return The next Thread to run
*/
-Thread * Scheduler::next_thread()
+Thread * Scheduler::next_thread(Thread *t)
{
- Thread *t = model->schedule_next_thread();
-
if (t != NULL) {
current = t;
readyList.remove(t);
* Print debugging information about the current state of the scheduler. Only
* prints something if debugging is enabled.
*/
-void Scheduler::print()
+void Scheduler::print() const
{
if (current)
DEBUG("Current thread: %d\n", current->get_id());
DEBUG("No current thread\n");
DEBUG("Num. threads in ready list: %zu\n", readyList.size());
- std::list<Thread *, MyAlloc< Thread * > >::iterator it;
+ std::list<Thread *, MyAlloc< Thread * > >::const_iterator it;
for (it = readyList.begin(); it != readyList.end(); it++)
DEBUG("In ready list: thread %d\n", (*it)->get_id());
}