X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=d96172e010d445a2b06eff5b392b89161126f12e;hb=5fe0eea8bf392753f69ed8193a592b299a137e9c;hp=d6ec03830abc9e395e16dec32945e827f739a52b;hpb=d4361e592c3a19d3a4ec24cea410118eac798b79;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index d6ec038..d96172e 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -3,12 +3,26 @@
 #include "common.h"
 #include "model.h"
 
+/** Constructor */
+Scheduler::Scheduler() :
+	current(NULL)
+{
+}
+
+/**
+ * Add a Thread to the scheduler's ready list.
+ * @param t The Thread to add
+ */
 void Scheduler::add_thread(Thread *t)
 {
 	DEBUG("thread %d\n", t->get_id());
 	readyList.push_back(t);
 }
 
+/**
+ * Remove a given Thread from the scheduler.
+ * @param t The Thread to remove
+ */
 void Scheduler::remove_thread(Thread *t)
 {
 	if (current == t)
@@ -17,10 +31,16 @@ void Scheduler::remove_thread(Thread *t)
 		readyList.remove(t);
 }
 
-Thread * Scheduler::next_thread(void)
+/**
+ * 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 *t)
 {
-	Thread *t = model->schedule_next_thread();
-
 	if (t != NULL) {
 		current = t;
 		readyList.remove(t);
@@ -37,20 +57,27 @@ Thread * Scheduler::next_thread(void)
 	return t;
 }
 
-Thread * Scheduler::get_current_thread(void)
+/**
+ * @return The currently-running Thread
+ */
+Thread * Scheduler::get_current_thread() const
 {
 	return current;
 }
 
-void Scheduler::print()
+/**
+ * Print debugging information about the current state of the scheduler. Only
+ * prints something if debugging is enabled.
+ */
+void Scheduler::print() const
 {
 	if (current)
 		DEBUG("Current thread: %d\n", current->get_id());
 	else
 		DEBUG("No current thread\n");
-	DEBUG("Num. threads in ready list: %ld\n", readyList.size());
+	DEBUG("Num. threads in ready list: %zu\n", readyList.size());
 
-	std::list<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());
 }