X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=9bd87077af6801811ce0cc05fa9e39df8f70cabc;hb=bf698c32ac174a4dcfce69ad78cccf2a65e3bf92;hp=4a9752a761ee105472e79543ec0fd89fbdd2f114;hpb=eed2c95c816686f295d6baa6743f74d9265b40c2;p=c11tester.git

diff --git a/schedule.cc b/schedule.cc
index 4a9752a7..9bd87077 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -102,13 +102,20 @@ 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
@@ -202,16 +209,31 @@ void Scheduler::wake(Thread *t)
 Thread * Scheduler::select_next_thread()
 {
 	int avail_threads = 0;
-	int thread_list[enabled_len];
-	for (int i = 0;i< enabled_len;i++) {
+	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;
 	}
 
-	if (avail_threads == 0 && !execution->getFuzzer()->has_paused_threads())
-		return NULL;	// No threads available
+	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);
+	}
 
-	Thread * thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
 	curr_thread_index = id_to_int(thread->get_id());
 	return thread;
 }