X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=98aef1a7514299cce1a3be93e0b0c3a043ef7b11;hp=8e306752da7a1c43d7e10f8fb106473eb6284636;hb=7966c737f2a88e5e1a56817eb9f6fdaead3eca92;hpb=3ad29c55c8a1647b1f6d753d08d8838e8a636e1f

diff --git a/schedule.h b/schedule.h
index 8e306752..98aef1a7 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,26 +1,53 @@
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
+
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <queue>
+#include <list>
+#include "mymemory.h"
+
+/* Forward declaration */
+class Thread;
+class Node;
 
-#include "libthreads.h"
-#include "model.h"
+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:
-	virtual void add_thread(struct thread *t) = 0;
-	virtual struct thread * next_thread(void) = 0;
-	virtual struct thread * get_current_thread(void) = 0;
-};
+	Scheduler();
+	void add_thread(Thread *t);
+	void remove_thread(Thread *t);
+	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() { return enabled; };
+	void remove_sleep(Thread *t);
+	void add_sleep(Thread *t);
+	enabled_type_t get_enabled(Thread *t);
+	void update_sleep_set(Node *n);
+	bool is_enabled(Thread *t) const;
+	bool is_enabled(thread_id_t tid) const;
 
-class DefaultScheduler: public Scheduler {
-public:
-	void add_thread(struct thread *t);
-	struct thread * next_thread(void);
-	struct thread * get_current_thread(void);
+	SNAPSHOTALLOC
 private:
-	std::queue<struct thread *> queue;
-	struct thread *current;
+	/** 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;
 };
 
 #endif /* __SCHEDULE_H__ */