int threadid = id_to_int(t->get_id());
if (threadid >= enabled_len) {
enabled_type_t *new_enabled = (enabled_type_t *)snapshot_malloc(sizeof(enabled_type_t) * (threadid + 1));
- memset(&new_enabled[enabled_len], 0, (threadid + 1 - enabled_len) * sizeof(enabled_type_t));
+ real_memset(&new_enabled[enabled_len], 0, (threadid + 1 - enabled_len) * sizeof(enabled_type_t));
if (enabled != NULL) {
- memcpy(new_enabled, enabled, enabled_len * sizeof(enabled_type_t));
+ real_memcpy(new_enabled, enabled, enabled_len * sizeof(enabled_type_t));
snapshot_free(enabled);
}
enabled = new_enabled;
/**
* @brief Check if a Thread is currently in the sleep set
* @param t The Thread to check
- * @return True if the Thread is currently enabled
*/
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
/**
* Add a Thread to the sleep set.
* @param t The Thread to add
+ * A Thread is in THREAD_SLEEP_SET if it is sleeping or blocked by a wait
+ * operation that should fail spuriously (decide by fuzzer).
*/
void Scheduler::add_sleep(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());
+ //curr_thread_index = id_to_int(thread->get_id());
return thread;
}