X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=035ee78caadcedfc3119939a8f29028c5e269de7;hp=664b2d245bea0b05a3f072d9c0eb75146bdfaf0f;hb=65a79092518f7818c93238caa9ebfdab3f36cda8;hpb=9b99c30c39f17b485eeca827a9e83806bf67ffac

diff --git a/schedule.h b/schedule.h
index 664b2d24..035ee78c 100644
--- a/schedule.h
+++ b/schedule.h
@@ -10,6 +10,13 @@
 
 /* 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. */
@@ -18,16 +25,27 @@ public:
 	Scheduler();
 	void add_thread(Thread *t);
 	void remove_thread(Thread *t);
-	void wait(Thread *wait, Thread *join);
+	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;
+	bool is_sleep_set(const Thread *t) const;
 
 	SNAPSHOTALLOC
 private:
 	/** The list of available Threads that are not currently running */
-	std::list<Thread *> readyList;
+	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;