Merge branch 'demsky'

[model-checker.git] / schedule.h

diff --git a/schedule.h b/schedule.h
index aa291ef8cd788872f14adce2f7199a6d3186f1de..664b2d245bea0b05a3f072d9c0eb75146bdfaf0f 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -1,26 +1,36 @@
+/** @file schedule.h
+ *     @brief Thread scheduler.
+ */
+
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
 #include <list>
+#include "mymemory.h"
 
-#include "libthreads.h"
-#include "model.h"
+/* Forward declaration */
+class Thread;
 
+/** @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 wait(Thread *wait, Thread *join);
+       void wake(Thread *t);
+       Thread * next_thread(Thread *t);
+       Thread * get_current_thread() const;
+       void print() 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::list<struct thread *> queue;
-       struct thread *current;
+       /** The list of available Threads that are not currently running */
+       std::list<Thread *> readyList;
+
+       /** The currently-running Thread */
+       Thread *current;
 };
 
 #endif /* __SCHEDULE_H__ */