X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=8e5554aec049ceee46f7bc1e4bf4cc9aa17b7c9f;hp=035ee78caadcedfc3119939a8f29028c5e269de7;hb=7742256df627848c1c375f979f5369a45c92057b;hpb=221ebda053805a3a0f8353c282bf4f9988a7291b

diff --git a/schedule.h b/schedule.h
index 035ee78c..8e5554ae 100644
--- a/schedule.h
+++ b/schedule.h
@@ -5,12 +5,9 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <list>
 #include "mymemory.h"
-
-/* Forward declaration */
-class Thread;
-class Node;
+#include "modeltypes.h"
+#include "classlist.h"
 
 typedef enum enabled_type {
 	THREAD_DISABLED,
@@ -18,29 +15,37 @@ typedef enum enabled_type {
 	THREAD_SLEEP_SET
 } enabled_type_t;
 
+void enabled_type_to_string(enabled_type_t e, char *str);
+
 /** @brief The Scheduler class performs the mechanics of Thread execution
  * scheduling. */
 class Scheduler {
 public:
 	Scheduler();
+	void register_engine(ModelExecution *execution);
+
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
 	void sleep(Thread *t);
 	void wake(Thread *t);
-	Thread * next_thread(Thread *t);
+	Thread * select_next_thread();
+	void set_current_thread(Thread *t);
 	Thread * get_current_thread() const;
 	void print() const;
 	enabled_type_t * get_enabled_array() const { return enabled; };
 	void remove_sleep(Thread *t);
 	void add_sleep(Thread *t);
 	enabled_type_t get_enabled(const Thread *t) const;
-	void update_sleep_set(Node *n);
 	bool is_enabled(const Thread *t) const;
 	bool is_enabled(thread_id_t tid) const;
 	bool is_sleep_set(const Thread *t) const;
+	bool is_sleep_set(thread_id_t tid) const;
+	bool all_threads_sleeping() const;
+	void set_scheduler_thread(thread_id_t tid);
 
 	SNAPSHOTALLOC
 private:
+	ModelExecution *execution;
 	/** The list of available Threads that are not currently running */
 	enabled_type_t *enabled;
 	int enabled_len;
@@ -51,4 +56,4 @@ private:
 	Thread *current;
 };
 
-#endif /* __SCHEDULE_H__ */
+#endif	/* __SCHEDULE_H__ */