X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.h;h=c18953d44824d09782e1cd389becbb96c181fb4c;hb=cfbcbb33437af392cea2a5092d89cfed47506b75;hp=8267feec9df32f2b26ae1c32a81d3a36f0affb8f;hpb=1d6c949fef3b5da936f8499dde464f8df634267a;p=c11tester.git

diff --git a/schedule.h b/schedule.h
index 8267feec..c18953d4 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,22 +1,58 @@
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
+
 #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. */
 class Scheduler {
 public:
+	Scheduler();
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
-	Thread * next_thread(void);
-	Thread * get_current_thread(void);
-	void print();
-  MEMALLOC
+	void sleep(Thread *t);
+	void wake(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:
-	std::list<Thread *, MyAlloc< Thread * > > readyList;
+	/** The list of available Threads that are not currently running */
+	enabled_type_t *enabled;
+	int enabled_len;
+	int curr_thread_index;
+	void set_enabled(Thread *t, enabled_type_t enabled_status);
+
+	/** The currently-running Thread */
 	Thread *current;
 };