#include <string.h>
#include <stdlib.h>
-#include "threads.h"
+#include "threads-model.h"
#include "schedule.h"
#include "common.h"
#include "model.h"
enabled_len=threadid+1;
}
enabled[threadid]=enabled_status;
+ if (enabled_status == THREAD_DISABLED)
+ model->check_promises_thread_disabled();
}
/**
* @brief Check if a Thread is currently enabled
+ *
+ * Check if a Thread is currently enabled. "Enabled" includes both
+ * THREAD_ENABLED and THREAD_SLEEP_SET.
* @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);
+ return is_enabled(t->get_id());
+}
+
+/**
+ * @brief Check if a Thread is currently enabled
+ *
+ * Check if a Thread is currently enabled. "Enabled" includes both
+ * THREAD_ENABLED and THREAD_SLEEP_SET.
+ * @param tid The ID of the Thread to check
+ * @return True if the Thread is currently enabled
+ */
+bool Scheduler::is_enabled(thread_id_t tid) const
+{
+ int i = id_to_int(tid);
+ return (i >= enabled_len) ? false : (enabled[i] != THREAD_DISABLED);
}
enabled_type_t Scheduler::get_enabled(Thread *t) {
- return enabled[id_to_int(t->get_id())];
+ int id = id_to_int(t->get_id());
+ ASSERT(id<enabled_len);
+ return enabled[id];
}
void Scheduler::update_sleep_set(Node *n) {
void Scheduler::wake(Thread *t)
{
ASSERT(!t->is_model_thread());
- set_enabled(t, THREAD_DISABLED);
+ set_enabled(t, THREAD_ENABLED);
t->set_state(THREAD_READY);
}
{
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 (enabled[curr_thread_index]==THREAD_ENABLED) {
- 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(curr_tid);
break;
}
if (curr_thread_index == old_curr_thread) {