X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.h;h=6ae2d2b53eeb354d522d9aac187c38cbdd4226b7;hb=30999f20b8426081e676adfc76d1c4af7b941e8e;hp=83416008eb01f2e0dba5e3886e49fdda52e68846;hpb=3e3ba08b7f8483430946ac7db0cc3bdbaa6f8a90;p=model-checker.git

diff --git a/schedule.h b/schedule.h
index 8341600..6ae2d2b 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,19 +1,57 @@
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
+
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <queue>
+#include "mymemory.h"
+#include "modeltypes.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:
-	void add_thread(struct thread *t);
-	struct thread * next_thread(void);
-	struct thread * get_current_thread(void);
+	Scheduler();
+	void add_thread(Thread *t);
+	void remove_thread(Thread *t);
+	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;
+	void set_scheduler_thread(thread_id_t tid);
+
+
+	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__ */