X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=f9660232a0294360952c05028620317f28a41bf6;hp=10312326528fadd4ad6e39f113030068d0cb19b7;hb=24471b532c168857225bc9620e0ebef3fe41c4fe;hpb=e9bc426a2bc92870a9f1ab2f5e7387e2867522ef

diff --git a/schedule.h b/schedule.h
index 10312326..f9660232 100644
--- a/schedule.h
+++ b/schedule.h
@@ -7,10 +7,7 @@
 
 #include "mymemory.h"
 #include "modeltypes.h"
-
-/* Forward declaration */
-class Thread;
-class Node;
+#include "classlist.h"
 
 typedef enum enabled_type {
 	THREAD_DISABLED,
@@ -18,29 +15,36 @@ 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 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 +55,4 @@ private:
 	Thread *current;
 };
 
-#endif /* __SCHEDULE_H__ */
+#endif	/* __SCHEDULE_H__ */