X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=88200a81cc650617044b4b0449477fbed1afb4e9;hp=c02ca62b12a16cd1c07d58ffd20f1ac383b57181;hb=af25bde59ce05189adee92825ecc03fbb83e675b;hpb=5f6566b5bd21517d0f963011ddf7bd919f8da7b9

diff --git a/schedule.cc b/schedule.cc
index c02ca62b..88200a81 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,28 +1,125 @@
+#include <string.h>
 #include <stdlib.h>
 
-#include "libthreads.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+/** Constructor */
+Scheduler::Scheduler() :
+	is_enabled(NULL),
+	enabled_len(0),
+	curr_thread_index(0),
+	current(NULL)
 {
-	DEBUG("thread %d\n", t->id);
-	queue.push_back(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+void Scheduler::set_enabled(Thread *t, bool enabled_status) {
+	int threadid=id_to_int(t->get_id());
+	if (threadid>=enabled_len) {
+		bool *new_enabled = (bool *)snapshot_malloc(sizeof(bool) * (threadid + 1));
+		memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
+		if (is_enabled != NULL) {
+			memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
+			snapshot_free(is_enabled);
+		}
+		is_enabled=new_enabled;
+		enabled_len=threadid+1;
+	}
+	is_enabled[threadid]=enabled_status;
+}
+
+/**
+ * Add a Thread to the scheduler's ready list.
+ * @param t The Thread to add
+ */
+void Scheduler::add_thread(Thread *t)
 {
-	if (queue.empty())
-		return NULL;
+	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	set_enabled(t, true);
+}
 
-	current = queue.front();
-	queue.pop_front();
+/**
+ * Remove a given Thread from the scheduler.
+ * @param t The Thread to remove
+ */
+void Scheduler::remove_thread(Thread *t)
+{
+	if (current == t)
+		current = NULL;
+	set_enabled(t, false);
+}
 
-	return current;
+/**
+ * Prevent a Thread from being scheduled. The sleeping Thread should be
+ * re-awoken via Scheduler::wake.
+ * @param thread The Thread that should sleep
+ */
+void Scheduler::sleep(Thread *t)
+{
+	set_enabled(t, false);
+	t->set_state(THREAD_BLOCKED);
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+/**
+ * Wake a Thread up that was previously waiting (see Scheduler::wait)
+ * @param t The Thread to wake up
+ */
+void Scheduler::wake(Thread *t)
+{
+	set_enabled(t, true);
+	t->set_state(THREAD_READY);
+}
+
+/**
+ * Select a Thread. This implementation defaults to round-robin, 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 ) {
+		int old_curr_thread = curr_thread_index;
+		while(true) {
+			curr_thread_index = (curr_thread_index+1) % enabled_len;
+			if (is_enabled[curr_thread_index]) {
+				t = model->get_thread(int_to_id(curr_thread_index));
+				break;
+			}
+			if (curr_thread_index == old_curr_thread) {
+				print();
+				return NULL;
+			}
+		}
+	} else {
+		curr_thread_index = id_to_int(t->get_id());
+	}
+
+	current = t;
+	print();
+	return t;
+}
+
+/**
+ * @return The currently-running Thread
+ */
+Thread * Scheduler::get_current_thread() const
 {
 	return current;
 }
+
+/**
+ * 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", id_to_int(current->get_id()));
+	else
+		DEBUG("No current thread\n");
+}