X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=67b40ec88a809d5c2bff10e07787481a7d934566;hb=d279e84ed265af079ea035d5dff49183def2c144;hp=4f5f3de7d70ddf881e15ac6bd39cb27c795c728e;hpb=f19fd46f4e67fd2d4a4041a4eecaa6789f97aba1;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 4f5f3de..67b40ec 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,74 +1,48 @@
-#include <stdlib.h>
-
-#include "libthreads.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-struct thread_list_node {
-	struct thread *t;
-	struct thread_list_node *next;
-	int live;
-};
-
-#define NUM_LIST_NODES 32
-
-struct thread_list_node *head, *tail;
-struct thread_list_node nodes[NUM_LIST_NODES];
-struct thread *current;
-
-static void enqueue_thread(struct thread *t)
+void Scheduler::add_thread(Thread *t)
 {
-	int i;
-	struct thread_list_node *node;
-
-	for (node = nodes, i = 0; node->live && i < NUM_LIST_NODES; i++, node++);
-	if (i >= NUM_LIST_NODES) {
-		printf("ran out of nodes\n");
-		exit(1);
-	}
-	node->t = t;
-	node->next = NULL;
-	node->live = 1;
-
-	if (tail)
-		tail->next = node;
-	else
-		head = node;
-	tail = node;
+	DEBUG("thread %d\n", t->get_id());
+	readyList.push_back(t);
 }
 
-static struct thread *dequeue_thread(void)
+Thread * Scheduler::next_thread(void)
 {
-	struct thread *pop;
-
-	if (!head)
-		return NULL;
-
-	pop = head->t;
-	head->live = 0;
-	if (head == tail)
-		tail = NULL;
-	head = head->next;
+	Thread *t = model->schedule_next_thread();
+
+	if (t != NULL) {
+		current = t;
+		readyList.remove(t);
+	} else if (readyList.empty()) {
+		t = NULL;
+	} else {
+		t = readyList.front();
+		current = t;
+		readyList.pop_front();
+	}
 
-	/* Set new current thread */
-	current = pop;
+	print();
 
-	return pop;
+	return t;
 }
 
-void DefaultScheduler::add_thread(struct thread *t)
+Thread * Scheduler::get_current_thread(void)
 {
-	DEBUG("thread %d\n", t->id);
-	enqueue_thread(t);
+	return current;
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+void Scheduler::print()
 {
-	return dequeue_thread();
-}
+	if (current)
+		printf("Current thread: %d\n", current->get_id());
+	else
+		printf("No current thread\n");
+	printf("Num. threads in ready list: %ld\n", readyList.size());
 
-struct thread *DefaultScheduler::get_current_thread(void)
-{
-	return current;
+	std::list<Thread *>::iterator it;
+	for (it = readyList.begin(); it != readyList.end(); it++)
+		printf("In ready list: thread %d\n", (*it)->get_id());
 }