merging stuff...made need to clean up some stuff...but need to push it somewhere...

[model-checker.git] / schedule.h

diff --git a/schedule.h b/schedule.h
index 83416008eb01f2e0dba5e3886e49fdda52e68846..8267feec9df32f2b26ae1c32a81d3a36f0affb8f 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -1,19 +1,23 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <queue>
+#include <list>
+#include "mymemory.h"
 
-#include "libthreads.h"
-#include "model.h"
+/* Forward declaration */
+class Thread;
 
 class Scheduler {
 public:
-       void add_thread(struct thread *t);
-       struct thread * next_thread(void);
-       struct thread * get_current_thread(void);
+       void add_thread(Thread *t);
+       void remove_thread(Thread *t);
+       Thread * next_thread(void);
+       Thread * get_current_thread(void);
+       void print();
+  MEMALLOC
 private:
-       std::queue<struct thread *> queue;
-       struct thread *current;
+       std::list<Thread *, MyAlloc< Thread * > > readyList;
+       Thread *current;
 };
 
 #endif /* __SCHEDULE_H__ */