Change initialize a bit

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 83616173c2c6c8878817162d8af8c20733766a1c..30af582dcc237991b690f606eb0c1e5ca11afa1b 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -5,8 +5,8 @@
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
-#include "nodestack.h"
 #include "execution.h"
+#include "fuzzer.h"
 
 /**
  * Format an "enabled_type_t" for printing
@@ -102,19 +102,26 @@ bool Scheduler::is_enabled(thread_id_t tid) const
  */
 bool Scheduler::is_sleep_set(const Thread *t) const
 {
-       return get_enabled(t) == THREAD_SLEEP_SET;
+       return is_sleep_set(t->get_id());
+}
+
+bool Scheduler::is_sleep_set(thread_id_t tid) const
+{
+       int id = id_to_int(tid);
+       ASSERT(id < enabled_len);
+       return enabled[id] == THREAD_SLEEP_SET;
 }
 
 /**
  * @brief Check if execution is stuck with no enabled threads and some sleeping
  * thread
- * @return True if no threads are enabled an some thread is in the sleep set;
+ * @return True if no threads are enabled and some thread is in the sleep set;
  * false otherwise
  */
 bool Scheduler::all_threads_sleeping() const
 {
        bool sleeping = false;
-       for (int i = 0; i < enabled_len; i++)
+       for (int i = 0;i < enabled_len;i++)
                if (enabled[i] == THREAD_ENABLED)
                        return false;
                else if (enabled[i] == THREAD_SLEEP_SET)
@@ -196,36 +203,39 @@ 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 = enabled_len;        // number of available threads
-       int thread_list[enabled_len];   // keep a list of threads to select from
-       for (int i = 0; i< enabled_len; i++){
-               thread_list[i] = i;
+       int avail_threads = 0;
+       int sleep_threads = 0;
+       int thread_list[enabled_len], sleep_list[enabled_len];
+       Thread * thread;
+
+       for (int i = 0;i < enabled_len;i++) {
+               if (enabled[i] == THREAD_ENABLED)
+                       thread_list[avail_threads++] = i;
+               else if (enabled[i] == THREAD_SLEEP_SET)
+                       sleep_list[sleep_threads++] = i;
        }
 
-       while (avail_threads > 0) {
-               int random_index = random() % avail_threads;
-               curr_thread_index = thread_list[random_index];  // randomly select a thread from available threads
-               
-               // curr_thread_index = (curr_thread_index + i + 1) % enabled_len;
-               thread_id_t curr_tid = int_to_id(curr_thread_index);
-               
-               if (enabled[curr_thread_index] == THREAD_ENABLED) {
-                       return model->get_thread(curr_tid);
-               } else {        // remove this threads from available threads 
-                       thread_list[random_index] = thread_list[avail_threads - 1]; 
-                       avail_threads--;
+       if (avail_threads == 0 && !execution->getFuzzer()->has_paused_threads()) {
+               if (sleep_threads != 0) {
+                       // No threads available, but some threads sleeping. Wake up one of them
+                       thread = execution->getFuzzer()->selectThread(sleep_list, sleep_threads);
+                       remove_sleep(thread);
+                       thread->set_wakeup_state(true);
+               } else {
+                       return NULL;    // No threads available and no threads sleeping.
                }
+       } else {
+               // Some threads are available
+               thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
        }
-       
-       /* No thread was enabled */
-       return NULL;
+
+       //curr_thread_index = id_to_int(thread->get_id());
+       return thread;
 }
 
 void Scheduler::set_scheduler_thread(thread_id_t tid) {
@@ -263,7 +273,7 @@ void Scheduler::print() const
        int curr_id = current ? id_to_int(current->get_id()) : -1;
 
        model_print("Scheduler: ");
-       for (int i = 0; i < enabled_len; i++) {
+       for (int i = 0;i < enabled_len;i++) {
                char str[20];
                enabled_type_to_string(enabled[i], str);
                model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str);