-#include "threads.h"
+#include <string.h>
+#include <stdlib.h>
+
+#include "threads-model.h"
#include "schedule.h"
#include "common.h"
#include "model.h"
+#include "nodestack.h"
/** Constructor */
Scheduler::Scheduler() :
- is_enabled(NULL),
+ enabled(NULL),
enabled_len(0),
curr_thread_index(0),
current(NULL)
{
}
-void Scheduler::set_enabled(Thread *t, bool enabled_status) {
+void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
int threadid=id_to_int(t->get_id());
if (threadid>=enabled_len) {
- bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));
- memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
- memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
- free(is_enabled);
- is_enabled=new_enabled;
+ 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));
+ if (enabled != NULL) {
+ memcpy(new_enabled, enabled, enabled_len*sizeof(enabled_type_t));
+ snapshot_free(enabled);
+ }
+ enabled=new_enabled;
enabled_len=threadid+1;
}
- is_enabled[threadid]=enabled_status;
+ enabled[threadid]=enabled_status;
+}
+
+/**
+ * @brief Check if a Thread is currently enabled
+ * @param t The Thread to check
+ * @return True if the Thread is currently enabled
+ */
+bool Scheduler::is_enabled(Thread *t) const
+{
+ int id = id_to_int(t->get_id());
+ return (id >= enabled_len) ? false : (enabled[id] != THREAD_DISABLED);
+}
+
+enabled_type_t Scheduler::get_enabled(Thread *t) {
+ return enabled[id_to_int(t->get_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
+ */
+void Scheduler::add_sleep(Thread *t)
+{
+ DEBUG("thread %d\n", id_to_int(t->get_id()));
+ set_enabled(t, THREAD_SLEEP_SET);
+}
+
+/**
+ * Remove a Thread from the sleep set.
+ * @param t The Thread to remove
+ */
+void Scheduler::remove_sleep(Thread *t)
+{
+ DEBUG("thread %d\n", id_to_int(t->get_id()));
+ set_enabled(t, THREAD_ENABLED);
}
/**
*/
void Scheduler::add_thread(Thread *t)
{
- DEBUG("thread %d\n", t->get_id());
- set_enabled(t, true);
+ DEBUG("thread %d\n", id_to_int(t->get_id()));
+ ASSERT(!t->is_model_thread());
+ set_enabled(t, THREAD_ENABLED);
}
/**
{
if (current == t)
current = NULL;
- set_enabled(t, false);
+ set_enabled(t, THREAD_DISABLED);
}
/**
*/
void Scheduler::sleep(Thread *t)
{
- set_enabled(t, false);
+ set_enabled(t, THREAD_DISABLED);
t->set_state(THREAD_BLOCKED);
}
*/
void Scheduler::wake(Thread *t)
{
- set_enabled(t, true);
+ ASSERT(!t->is_model_thread());
+ set_enabled(t, THREAD_ENABLED);
t->set_state(THREAD_READY);
}
/**
- * Remove one Thread from the scheduler. This implementation defaults to FIFO,
- * if a thread is not already provided.
+ * Select a Thread. This implementation defaults to round-robin, if a
+ * thread is not already provided.
*
* @param t Thread to run, if chosen by an external entity (e.g.,
* ModelChecker). May be NULL to indicate no external choice.
*/
Thread * Scheduler::next_thread(Thread *t)
{
- printf("%p\n",t);
if ( t == NULL ) {
int old_curr_thread = curr_thread_index;
+ bool have_enabled_thread_with_priority=false;
+ Node *n=model->get_curr_node();
+
+ for(int i=0;i<enabled_len;i++) {
+ thread_id_t tid=int_to_id(i);
+ if (n->has_priority(tid)) {
+ //Have a thread with priority
+ if (enabled[i]!=THREAD_DISABLED)
+ have_enabled_thread_with_priority=true;
+ }
+ }
+
while(true) {
curr_thread_index = (curr_thread_index+1) % enabled_len;
- if (is_enabled[curr_thread_index]) {
- t = model->get_thread(int_to_id(curr_thread_index));
+ thread_id_t curr_tid=int_to_id(curr_thread_index);
+ if (enabled[curr_thread_index]==THREAD_ENABLED&&
+ (!have_enabled_thread_with_priority||n->has_priority(curr_tid))) {
+ t = model->get_thread(int_to_id(curr_tid));
break;
}
if (curr_thread_index == old_curr_thread) {
return NULL;
}
}
+ } else if (t->is_model_thread()) {
+ /* model-checker threads never run */
+ t = NULL;
} else {
curr_thread_index = id_to_int(t->get_id());
}
- printf("index=%u enabled=%u\n", curr_thread_index, is_enabled[curr_thread_index]);
current = t;
print();
*/
Thread * Scheduler::get_current_thread() const
{
+ ASSERT(!current || !current->is_model_thread());
return current;
}
void Scheduler::print() const
{
if (current)
- DEBUG("Current thread: %d\n", current->get_id());
+ DEBUG("Current thread: %d\n", id_to_int(current->get_id()));
else
DEBUG("No current thread\n");
}