fix merge

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 5c93381b99763344d3fce9548a39955c041c6d79..8883d2a9b82cccc78a47b62a14d05e0e64ee52a5 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -16,9 +16,11 @@ void Scheduler::set_enabled(Thread *t, bool enabled_status) {
        int threadid=id_to_int(t->get_id());
        if (threadid>=enabled_len) {
                bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));
-               memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
                memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
-               free(is_enabled);
+               if (is_enabled != NULL) {
+                       memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
+                       free(is_enabled);
+               }
                is_enabled=new_enabled;
                enabled_len=threadid+1;
        }
@@ -77,7 +79,6 @@ void Scheduler::wake(Thread *t)
  */
 Thread * Scheduler::next_thread(Thread *t)
 {
-       printf("%p\n",t);
        if ( t == NULL ) {
                int old_curr_thread = curr_thread_index;
                while(true) {
@@ -94,7 +95,6 @@ Thread * Scheduler::next_thread(Thread *t)
        } else {
                curr_thread_index = id_to_int(t->get_id());
        }
-       printf("index=%u enabled=%u\n", curr_thread_index, is_enabled[curr_thread_index]);
 
        current = t;
        print();