model: only backtrack fences when acquire is before release

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index d49e62bae3a9101a204df7a81f7eea557a5614dd..e87490313cf4836e1f11dab9528ef7ad00b6bf26 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -177,9 +177,7 @@ void Scheduler::wake(Thread *t)
 }
 
 /**
- * Select a Thread to run and set it as the 'current' Thread. This
- * implementation defaults to round-robin
- *
+ * @brief Select a Thread to run via round-robin
  * @return The next Thread to run
  */
 Thread * Scheduler::select_next_thread()
@@ -192,28 +190,21 @@ Thread * Scheduler::select_next_thread()
                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;
                }
        }
 
-       while (true) {
-               curr_thread_index = (curr_thread_index + 1) % enabled_len;
+       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))) {
-                       current = model->get_thread(curr_tid);
-                       if (DBG_ENABLED())
-                               print();
-                       return current;
-               }
-               if (curr_thread_index == old_curr_thread) {
-                       if (DBG_ENABLED())
-                               print();
-                       return NULL;
+                       return model->get_thread(curr_tid);
                }
        }
+       /* No thread was enabled */
+       return NULL;
 }
 
 /**