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 eb0f68c74be5cdf101fca6f6c6166680c6f21d90..8267feec9df32f2b26ae1c32a81d3a36f0affb8f 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -1,21 +1,23 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include "libthreads.h"
-#include "model.h"
+#include <list>
+#include "mymemory.h"
 
-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;
-};
+/* Forward declaration */
+class Thread;
 
-class DefaultScheduler: public Scheduler {
+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::list<Thread *, MyAlloc< Thread * > > readyList;
+       Thread *current;
 };
 
 #endif /* __SCHEDULE_H__ */