#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
/** Constructor */
Scheduler::Scheduler() :
+ execution(NULL),
enabled(NULL),
enabled_len(0),
curr_thread_index(0),
{
}
+/**
+ * @brief Register the ModelExecution engine
+ * @param execution The ModelExecution which is controlling execution
+ */
+void Scheduler::register_engine(ModelExecution *execution)
+{
+ this->execution = execution;
+}
+
void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
int threadid = id_to_int(t->get_id());
if (threadid >= enabled_len) {
enabled_len = threadid + 1;
}
enabled[threadid] = enabled_status;
- if (enabled_status == THREAD_DISABLED)
- model->check_promises_thread_disabled();
}
/**
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)
return enabled[id];
}
-void Scheduler::update_sleep_set(Node *n) {
- enabled_type_t *enabled_array = n->get_enabled_array();
- for (int i = 0; i < enabled_len; i++) {
- if (enabled_array[i] == THREAD_SLEEP_SET) {
- enabled[i] = THREAD_SLEEP_SET;
- }
- }
-}
-
/**
* Add a Thread to the sleep set.
* @param t The Thread to add
/**
* @brief Select a Thread to run via round-robin
+ *
+ *
* @return The next Thread to run
*/
Thread * Scheduler::select_next_thread()
{
- int old_curr_thread = curr_thread_index;
- Node *n = model->get_curr_node();
+ int avail_threads = 0;
+ int thread_list[enabled_len];
+ for (int i = 0;i< enabled_len;i++) {
+ if (enabled[i] == THREAD_ENABLED)
+ thread_list[avail_threads++] = i;
+ }
- bool have_enabled_thread_with_priority = false;
- if (model->params.fairwindow != 0) {
- for (int i = 0; i < enabled_len; i++) {
- thread_id_t tid = int_to_id(i);
- if (n->has_priority(tid)) {
- DEBUG("Node (tid %d) has priority\n", i);
- if (enabled[i] != THREAD_DISABLED)
- have_enabled_thread_with_priority = true;
- }
- }
- }
+ if (avail_threads == 0)
+ return NULL;// No threads availablex
- for (int i = 0; i < enabled_len; i++) {
- curr_thread_index = (old_curr_thread + i + 1) % enabled_len;
- thread_id_t curr_tid = int_to_id(curr_thread_index);
- if (model->params.yieldon) {
- bool bad_thread = false;
- for (int j = 0; j < enabled_len; j++) {
- thread_id_t tother = int_to_id(j);
- if ((enabled[j] != THREAD_DISABLED) && n->has_priority_over(curr_tid, tother)) {
- bad_thread=true;
- break;
- }
- }
- if (bad_thread)
- continue;
- }
-
- if (enabled[curr_thread_index] == THREAD_ENABLED &&
- (!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
- return model->get_thread(curr_tid);
- }
- }
-
- /* No thread was enabled */
- return NULL;
+ Thread * thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
+ curr_thread_index = id_to_int(thread->get_id());
+ return thread;
}
void Scheduler::set_scheduler_thread(thread_id_t tid) {
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);