X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=a236bd0cc66644197e178e00d4cc44b0a195f3c2;hb=872ca5527c4df3f59e09b7050fd9d099e73cd362;hp=b1b41c3d88d579a766d5cd45ccf26815bc551a1e;hpb=e00292b5adf2b85eb1c6e2399159b5c28fde48eb;p=c11tester.git

diff --git a/schedule.cc b/schedule.cc
index b1b41c3d..a236bd0c 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -15,13 +15,13 @@ Scheduler::Scheduler() :
 {
 }
 
-void Scheduler::set_enabled(Thread *t, bool enabled_status) {
+void Scheduler::set_enabled(Thread *t, enabled_type_t 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));
+		enabled_type_t *new_enabled = (enabled_type_t *)snapshot_malloc(sizeof(enabled_type_t) * (threadid + 1));
+		memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(enabled_type_t));
 		if (is_enabled != NULL) {
-			memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
+			memcpy(new_enabled, is_enabled, enabled_len*sizeof(enabled_type_t));
 			snapshot_free(is_enabled);
 		}
 		is_enabled=new_enabled;
@@ -36,8 +36,8 @@ void Scheduler::set_enabled(Thread *t, bool enabled_status) {
  */
 void Scheduler::add_thread(Thread *t)
 {
-	DEBUG("thread %d\n", t->get_id());
-	set_enabled(t, true);
+	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	set_enabled(t, THREAD_ENABLED);
 }
 
 /**
@@ -48,7 +48,7 @@ void Scheduler::remove_thread(Thread *t)
 {
 	if (current == t)
 		current = NULL;
-	set_enabled(t, false);
+	set_enabled(t, THREAD_DISABLED);
 }
 
 /**
@@ -58,7 +58,7 @@ void Scheduler::remove_thread(Thread *t)
  */
 void Scheduler::sleep(Thread *t)
 {
-	set_enabled(t, false);
+	set_enabled(t, THREAD_DISABLED);
 	t->set_state(THREAD_BLOCKED);
 }
 
@@ -68,7 +68,7 @@ void Scheduler::sleep(Thread *t)
  */
 void Scheduler::wake(Thread *t)
 {
-	set_enabled(t, true);
+	set_enabled(t, THREAD_DISABLED);
 	t->set_state(THREAD_READY);
 }
 
@@ -119,7 +119,7 @@ Thread * Scheduler::get_current_thread() const
 void Scheduler::print() const
 {
 	if (current)
-		DEBUG("Current thread: %d\n", current->get_id());
+		DEBUG("Current thread: %d\n", id_to_int(current->get_id()));
 	else
 		DEBUG("No current thread\n");
 }