X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.h;h=c18953d44824d09782e1cd389becbb96c181fb4c;hb=cfbcbb33437af392cea2a5092d89cfed47506b75;hp=3a54e8cfda9a55c2bcce5af72bc006bcf32a4588;hpb=59eb730e1d19a0825008c40eb521bfc5c29df5f9;p=c11tester.git

diff --git a/schedule.h b/schedule.h
index 3a54e8cf..c18953d4 100644
--- a/schedule.h
+++ b/schedule.h
@@ -5,8 +5,8 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <list>
 #include "mymemory.h"
+#include "modeltypes.h"
 
 /* Forward declaration */
 class Thread;
@@ -18,6 +18,8 @@ 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 {
@@ -27,18 +29,25 @@ public:
 	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() { 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(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 */
-	enabled_type_t * is_enabled;
+	enabled_type_t *enabled;
 	int enabled_len;
 	int curr_thread_index;
 	void set_enabled(Thread *t, enabled_type_t enabled_status);