Some edits

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index f26a1a6a133b569ed25c72141545ae061fbdb9b2..4a9752a761ee105472e79543ec0fd89fbdd2f114 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -5,7 +5,6 @@
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
-#include "nodestack.h"
 #include "execution.h"
 #include "fuzzer.h"
 
@@ -197,12 +196,10 @@ void Scheduler::wake(Thread *t)
 /**
  * @brief Select a Thread to run via round-robin
  *
- * @param n The current Node, holding priority information for the next thread
- * selection
  *
  * @return The next Thread to run
  */
-Thread * Scheduler::select_next_thread(Node *n)
+Thread * Scheduler::select_next_thread()
 {
        int avail_threads = 0;
        int thread_list[enabled_len];
@@ -211,10 +208,10 @@ Thread * Scheduler::select_next_thread(Node *n)
                        thread_list[avail_threads++] = i;
        }
 
-       if (avail_threads == 0)
-               return NULL;                            // No threads availablex
+       if (avail_threads == 0 && !execution->getFuzzer()->has_paused_threads())
+               return NULL;    // No threads available
 
-       Thread * thread = execution->getFuzzer()->selectThread(n, thread_list, avail_threads);
+       Thread * thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
        curr_thread_index = id_to_int(thread->get_id());
        return thread;
 }