various fixes. linux rw locks should work again with -m 1

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index da6d469fdfe81498e9078423a14eb6310a0ad9e3..93379c2d9df3f1a03a4046ae4753a07115400625 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -29,6 +29,8 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
                enabled_len=threadid+1;
        }
        enabled[threadid]=enabled_status;
+       if (enabled_status == THREAD_DISABLED)
+               model->check_promises_thread_disabled();
 }
 
 /**
@@ -43,7 +45,9 @@ bool Scheduler::is_enabled(Thread *t) const
 }
 
 enabled_type_t Scheduler::get_enabled(Thread *t) {
-       return enabled[id_to_int(t->get_id())];
+       int id = id_to_int(t->get_id());
+       ASSERT(id<enabled_len);
+       return enabled[id];
 }
 
 void Scheduler::update_sleep_set(Node *n) {
@@ -131,10 +135,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(curr_tid);
                                break;
                        }
                        if (curr_thread_index == old_curr_thread) {