X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=4c67c28492b9cc24facc2e43827eee2ca198f28d;hp=fb4d082adc2dbe220baf49d8347fc70fe6c0d560;hb=bde05423f877315edafd321fe5de7235c58ac898;hpb=15190694fd79202132be5f6e056fa5c00893664e

diff --git a/schedule.h b/schedule.h
index fb4d082a..4c67c284 100644
--- a/schedule.h
+++ b/schedule.h
@@ -5,11 +5,20 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <list>
 #include "mymemory.h"
+#include "modeltypes.h"
 
 /* Forward declaration */
 class Thread;
+class Node;
+
+typedef enum enabled_type {
+	THREAD_DISABLED,
+	THREAD_ENABLED,
+	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. */
@@ -20,18 +29,28 @@ public:
 	void remove_thread(Thread *t);
 	void sleep(Thread *t);
 	void wake(Thread *t);
-	Thread * next_thread(Thread *t);
+	Thread * select_next_thread(Node *n);
+	void set_current_thread(Thread *t);
 	Thread * get_current_thread() const;
 	void print() const;
-	bool * get_enabled() { return is_enabled; };
+	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:
 	/** The list of available Threads that are not currently running */
-	bool * is_enabled;
+	enabled_type_t *enabled;
 	int enabled_len;
 	int curr_thread_index;
-	void set_enabled(Thread *t, bool enabled_status);
+	void set_enabled(Thread *t, enabled_type_t enabled_status);
 
 	/** The currently-running Thread */
 	Thread *current;