model: schedule appropriate fence backtracking points

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 444e1a82982535339f241d5eb203fddf1d00a15a..e87490313cf4836e1f11dab9528ef7ad00b6bf26 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -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),
@@ -151,53 +177,49 @@ 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)) {
-                               DEBUG("Node (tid %d) has priority\n", i);
-                               //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;
+}
+
+/**
+ * @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();
 }
 
 /**
@@ -215,8 +237,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");
 }