X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=be4a92f739a1129bb2aa4bee50bb23ba0a3f8556;hb=6405f91a3847312815ffaa8407787b7d3e30a21b;hp=8f7f1a98d8cc2833c812243cecaa284d375286ad;hpb=0e49f3778dcb00bcf9c1690b37864021822d5353;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 8f7f1a9..be4a92f 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -32,13 +32,39 @@ void Scheduler::remove_thread(Thread *t)
 }
 
 /**
- * Remove one Thread from the scheduler. This implementation performs FIFO.
- * @return The next Thread to run
+ * Force one Thread to wait on another Thread. The "join" Thread should
+ * eventually wake up the waiting Thread via Scheduler::wake.
+ * @param wait The Thread that should wait
+ * @param join The Thread on which we are waiting.
  */
-Thread * Scheduler::next_thread()
+void Scheduler::wait(Thread *wait, Thread *join)
 {
-	Thread *t = model->schedule_next_thread();
+	ASSERT(!join->is_complete());
+	remove_thread(wait);
+	join->push_wait_list(wait);
+	wait->set_state(THREAD_BLOCKED);
+}
 
+/**
+ * Wake a Thread up that was previously waiting (see Scheduler::wait)
+ * @param t The Thread to wake up
+ */
+void Scheduler::wake(Thread *t)
+{
+	add_thread(t);
+	t->set_state(THREAD_READY);
+}
+
+/**
+ * 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)
+{
 	if (t != NULL) {
 		current = t;
 		readyList.remove(t);
@@ -67,7 +93,7 @@ Thread * Scheduler::get_current_thread() const
  * 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());
@@ -75,7 +101,7 @@ void Scheduler::print()
 		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());
 }