Merge branch 'norris'

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 69e3d88803bcc06d15ee2fed115330b1397662f5..be4a92f739a1129bb2aa4bee50bb23ba0a3f8556 100644 (file)
--- 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);