X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.h;h=d4780c884d672afd4b3eabc4e1fc22aaf30be289;hb=bc6f456608ec87e9bdbdc7e095225b24ee7938be;hp=e81ea935cc961b1568a25e095ae0ca4a6c9813bd;hpb=9ab763adc965ca76a8d65b9898d20c60cdb44445;p=c11tester.git

diff --git a/schedule.h b/schedule.h
index e81ea935..d4780c88 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,4 +1,6 @@
-/* -*- Mode: C; indent-tabs-mode: t -*- */
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
 
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
@@ -8,18 +10,43 @@
 
 /* Forward declaration */
 class Thread;
+class Node;
 
+typedef enum enabled_type {
+	THREAD_DISABLED,
+	THREAD_ENABLED,
+	THREAD_SLEEP_SET
+} enabled_type_t;
+
+/** @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 * next_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;
+
+	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;
 };