fix norris mentioned bug
[model-checker.git] / schedule.cc
index 26217d0a99dfd918d37d90fd77b3a803aefadc26..1bd1b0f983fef2a602fe6b089db723c4526adc4a 100644 (file)
@@ -7,6 +7,32 @@
 #include "model.h"
 #include "nodestack.h"
 
+/**
+ * Format an "enabled_type_t" for printing
+ * @param e The type to format
+ * @param str The output character array
+ */
+static void enabled_type_to_string(enabled_type_t e, char *str)
+{
+       const char *res;
+       switch (e) {
+       case THREAD_DISABLED:
+               res = "disabled";
+               break;
+       case THREAD_ENABLED:
+               res = "enabled";
+               break;
+       case THREAD_SLEEP_SET:
+               res = "sleep";
+               break;
+       default:
+               ASSERT(0);
+               res = NULL;
+               break;
+       }
+       strcpy(str, res);
+}
+
 /** Constructor */
 Scheduler::Scheduler() :
        enabled(NULL),
@@ -17,18 +43,18 @@ Scheduler::Scheduler() :
 }
 
 void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
-       int threadid=id_to_int(t->get_id());
-       if (threadid>=enabled_len) {
+       int threadid = id_to_int(t->get_id());
+       if (threadid >= enabled_len) {
                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));
+               memset(&new_enabled[enabled_len], 0, (threadid + 1 - enabled_len) * sizeof(enabled_type_t));
                if (enabled != NULL) {
-                       memcpy(new_enabled, enabled, enabled_len*sizeof(enabled_type_t));
+                       memcpy(new_enabled, enabled, enabled_len * sizeof(enabled_type_t));
                        snapshot_free(enabled);
                }
-               enabled=new_enabled;
-               enabled_len=threadid+1;
+               enabled = new_enabled;
+               enabled_len = threadid + 1;
        }
-       enabled[threadid]=enabled_status;
+       enabled[threadid] = enabled_status;
        if (enabled_status == THREAD_DISABLED)
                model->check_promises_thread_disabled();
 }
@@ -41,7 +67,7 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
  * @param t The Thread to check
  * @return True if the Thread is currently enabled
  */
-bool Scheduler::is_enabled(Thread *t) const
+bool Scheduler::is_enabled(const Thread *t) const
 {
        return is_enabled(t->get_id());
 }
@@ -60,17 +86,28 @@ bool Scheduler::is_enabled(thread_id_t tid) const
        return (i >= enabled_len) ? false : (enabled[i] != THREAD_DISABLED);
 }
 
-enabled_type_t Scheduler::get_enabled(Thread *t) {
+/**
+ * @brief Check if a Thread is currently in the sleep set
+ * @param t The Thread to check
+ * @return True if the Thread is currently enabled
+ */
+bool Scheduler::is_sleep_set(const Thread *t) const
+{
+       return get_enabled(t) == THREAD_SLEEP_SET;
+}
+
+enabled_type_t Scheduler::get_enabled(const Thread *t) const
+{
        int id = id_to_int(t->get_id());
-       ASSERT(id<enabled_len);
+       ASSERT(id < enabled_len);
        return enabled[id];
 }
 
 void Scheduler::update_sleep_set(Node *n) {
-       enabled_type_t *enabled_array=n->get_enabled_array();
-       for(int i=0;i<enabled_len;i++) {
-               if (enabled_array[i]==THREAD_SLEEP_SET) {
-                       enabled[i]=THREAD_SLEEP_SET;
+       enabled_type_t *enabled_array = n->get_enabled_array();
+       for (int i = 0; i < enabled_len; i++) {
+               if (enabled_array[i] == THREAD_SLEEP_SET) {
+                       enabled[i] = THREAD_SLEEP_SET;
                }
        }
 }
@@ -140,52 +177,53 @@ void Scheduler::wake(Thread *t)
 }
 
 /**
- * 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.
+ * @brief Select a Thread to run via round-robin
  * @return The next Thread to run
  */
-Thread * Scheduler::next_thread(Thread *t)
-{
-       if ( t == NULL ) {
-               int old_curr_thread = curr_thread_index;
-               bool have_enabled_thread_with_priority=false;
-               Node *n=model->get_curr_node();
-
-               for(int i=0;i<enabled_len;i++) {
-                       thread_id_t tid=int_to_id(i);
-                       if (n->has_priority(tid)) {
-                               //Have a thread with priority
-                               if (enabled[i]!=THREAD_DISABLED)
-                                       have_enabled_thread_with_priority=true;
-                       }
+Thread * Scheduler::select_next_thread()
+{
+       int old_curr_thread = curr_thread_index;
+       bool have_enabled_thread_with_priority = false;
+       Node *n = model->get_curr_node();
+
+       for (int i = 0; i < enabled_len; i++) {
+               thread_id_t tid = int_to_id(i);
+               if (n->has_priority(tid)) {
+                       DEBUG("Node (tid %d) has priority\n", i);
+                       if (enabled[i] != THREAD_DISABLED)
+                               have_enabled_thread_with_priority = true;
                }
+       }
 
-               while(true) {
-                       curr_thread_index = (curr_thread_index+1) % enabled_len;
-                       thread_id_t curr_tid=int_to_id(curr_thread_index);
-                       if (enabled[curr_thread_index]==THREAD_ENABLED&&
-                                       (!have_enabled_thread_with_priority||n->has_priority(curr_tid))) {
-                               t = model->get_thread(curr_tid);
-                               break;
-                       }
-                       if (curr_thread_index == old_curr_thread) {
-                               print();
-                               return NULL;
-                       }
+       for (int i = 0; i < enabled_len; i++) {
+               curr_thread_index = (old_curr_thread + i + 1) % enabled_len;
+               thread_id_t curr_tid = int_to_id(curr_thread_index);
+               if (enabled[curr_thread_index] == THREAD_ENABLED &&
+                               (!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
+                       return model->get_thread(curr_tid);
                }
-       } else if (t->is_model_thread()) {
-               /* model-checker threads never run */
-               t = NULL;
-       } else {
-               curr_thread_index = id_to_int(t->get_id());
        }
+       /* No thread was enabled */
+       return NULL;
+}
+
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+       curr_thread_index=id_to_int(tid);
+}
+
+/**
+ * @brief Set the current "running" Thread
+ * @param t Thread to run
+ */
+void Scheduler::set_current_thread(Thread *t)
+{
+       ASSERT(t && !t->is_model_thread());
+
+       //curr_thread_index = id_to_int(t->get_id());
 
        current = t;
-       print();
-       return t;
+       if (DBG_ENABLED())
+               print();
 }
 
 /**
@@ -203,8 +241,13 @@ Thread * Scheduler::get_current_thread() const
  */
 void Scheduler::print() const
 {
-       if (current)
-               DEBUG("Current thread: %d\n", id_to_int(current->get_id()));
-       else
-               DEBUG("No current thread\n");
+       int curr_id = current ? id_to_int(current->get_id()) : -1;
+
+       model_print("Scheduler: ");
+       for (int i = 0; i < enabled_len; i++) {
+               char str[20];
+               enabled_type_to_string(enabled[i], str);
+               model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str);
+       }
+       model_print("\n");
 }