create enumeration for enabled information...switch from bools to the enumeration

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 10a335cb3ef82e2428a802d449e9bf75d61b0268..a236bd0cc66644197e178e00d4cc44b0a195f3c2 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -15,14 +15,14 @@ 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 *)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));
-                       free(is_enabled);
+                       memcpy(new_enabled, is_enabled, enabled_len*sizeof(enabled_type_t));
+                       snapshot_free(is_enabled);
                }
                is_enabled=new_enabled;
                enabled_len=threadid+1;
@@ -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,13 +68,13 @@ void Scheduler::sleep(Thread *t)
  */
 void Scheduler::wake(Thread *t)
 {
-       set_enabled(t, true);
+       set_enabled(t, THREAD_DISABLED);
        t->set_state(THREAD_READY);
 }
 
 /**
- * Remove one Thread from the scheduler. This implementation defaults to FIFO,
- * if a thread is not already provided.
+ * 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.
@@ -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");
 }