fix various problems with my 64-bit clean hack

[model-checker.git] / schedule.h

diff --git a/schedule.h b/schedule.h
index 28f5b8d0fa864794f54f6b5788aec859412b8b8f..e81ea935cc961b1568a25e095ae0ca4a6c9813bd 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -1,19 +1,26 @@
+/* -*- Mode: C; indent-tabs-mode: t -*- */
+
 #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;
+class Scheduler {
+public:
+       Scheduler();
+       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;
 };
 
-void scheduler_init(ModelChecker *mod);
-
 #endif /* __SCHEDULE_H__ */