X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.h;h=10312326528fadd4ad6e39f113030068d0cb19b7;hb=82df62c2b0805848b87bb71df5b66a4a66f8e25d;hp=7875e0b6e24147c5e526b58ace7a580bc53c79c3;hpb=3e6579acd2456b1a7e0fc0aaa7e2e9b5bdb78a27;p=model-checker.git

diff --git a/schedule.h b/schedule.h
index 7875e0b..1031232 100644
--- a/schedule.h
+++ b/schedule.h
@@ -5,11 +5,18 @@
 #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;
 
 /** @brief The Scheduler class performs the mechanics of Thread execution
  * scheduling. */
@@ -18,17 +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;