make scheduler choose fair schedules when threads with priority are sleeping...

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index ea1d58208ea2b692ed19596c2929a73b254fc998..f68cb528a16b846a2f2653ecd3336b6ca496fee8 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "threads.h"
+#include "threads-model.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
@@ -115,7 +115,7 @@ void Scheduler::sleep(Thread *t)
 void Scheduler::wake(Thread *t)
 {
        ASSERT(!t->is_model_thread());
-       set_enabled(t, THREAD_DISABLED);
+       set_enabled(t, THREAD_ENABLED);
        t->set_state(THREAD_READY);
 }
 
@@ -131,10 +131,24 @@ 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;
+                       }
+               }
+
                while(true) {
                        curr_thread_index = (curr_thread_index+1) % enabled_len;
-                       if (enabled[curr_thread_index]==THREAD_ENABLED) {
-                               t = model->get_thread(int_to_id(curr_thread_index));
+                       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(int_to_id(curr_tid));
                                break;
                        }
                        if (curr_thread_index == old_curr_thread) {