X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=2ef4c4d2f968ef2c97dffbf8f17a3e80c447c9cd;hb=130a35155171503883aaf18e57f8957ce63d06e8;hp=62ba8fb3ff0ee631d960649286142d0608560135;hpb=a635c5cdf004963a948dfb40e0fa27ce258bbccf;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 62ba8fb..2ef4c4d 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -6,6 +6,7 @@
 #include "common.h"
 #include "model.h"
 #include "nodestack.h"
+#include "execution.h"
 
 /**
  * Format an "enabled_type_t" for printing
@@ -35,6 +36,7 @@ void enabled_type_to_string(enabled_type_t e, char *str)
 
 /** Constructor */
 Scheduler::Scheduler() :
+	execution(NULL),
 	enabled(NULL),
 	enabled_len(0),
 	curr_thread_index(0),
@@ -42,6 +44,15 @@ Scheduler::Scheduler() :
 {
 }
 
+/**
+ * @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) {
@@ -56,7 +67,7 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 	}
 	enabled[threadid] = enabled_status;
 	if (enabled_status == THREAD_DISABLED)
-		model->check_promises_thread_disabled();
+		execution->check_promises_thread_disabled();
 }
 
 /**
@@ -195,12 +206,15 @@ void Scheduler::wake(Thread *t)
 
 /**
  * @brief Select a Thread to run via round-robin
+ *
+ * @param n The current Node, holding priority information for the next thread
+ * selection
+ *
  * @return The next Thread to run
  */
-Thread * Scheduler::select_next_thread()
+Thread * Scheduler::select_next_thread(Node *n)
 {
 	int old_curr_thread = curr_thread_index;
-	Node *n = model->get_curr_node();
 
 	bool have_enabled_thread_with_priority = false;
 	if (model->params.fairwindow != 0) {