X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=schedule.h;h=664b2d245bea0b05a3f072d9c0eb75146bdfaf0f;hp=360b390512b4776d0af54eb331aa91682c4906c0;hb=50b95c3747f4fe79b2ab1a1a6fc303224e16e418;hpb=3ffc7186fd49a2dd2a5f5756511614fb3f06ac56

diff --git a/schedule.h b/schedule.h
index 360b390..664b2d2 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,21 +1,36 @@
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
+
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include "libthreads.h"
-#include "model.h"
+#include <list>
+#include "mymemory.h"
 
-struct scheduler {
-	void (*init)(void);
-	void (*exit)(void);
-	void (*add_thread)(struct thread *t);
-	struct thread * (*next_thread)(void);
-	struct thread * (*get_current_thread)(void);
+/* Forward declaration */
+class Thread;
 
-	void *priv;
-};
+/** @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);
+	void wait(Thread *wait, Thread *join);
+	void wake(Thread *t);
+	Thread * next_thread(Thread *t);
+	Thread * get_current_thread() const;
+	void print() const;
 
-void scheduler_init(struct model_checker *mod);
-void schedule_add_thread(struct thread *t);
-struct thread *schedule_choose_next(void);
+	SNAPSHOTALLOC
+private:
+	/** The list of available Threads that are not currently running */
+	std::list<Thread *> readyList;
+
+	/** The currently-running Thread */
+	Thread *current;
+};
 
 #endif /* __SCHEDULE_H__ */