redo model object initialization

[c11tester.git] / schedule.h

diff --git a/schedule.h b/schedule.h
index c8555b6916d9f9badc8f69d14618ec73de8ffeae..49bd41f308d7d82a5c174ead184f19f971c8d999 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -7,10 +7,7 @@
 
 #include "mymemory.h"
 #include "modeltypes.h"
-
-/* Forward declaration */
-class Thread;
-class Node;
+#include "classlist.h"
 
 typedef enum enabled_type {
        THREAD_DISABLED,
@@ -18,16 +15,20 @@ typedef enum enabled_type {
        THREAD_SLEEP_SET
 } enabled_type_t;
 
+void enabled_type_to_string(enabled_type_t e, char *str);
+
 /** @brief The Scheduler class performs the mechanics of Thread execution
  * scheduling. */
 class Scheduler {
 public:
        Scheduler();
+       void register_engine(ModelExecution *execution);
+
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
        void sleep(Thread *t);
        void wake(Thread *t);
-       Thread * select_next_thread();
+       Thread * select_next_thread(Node *n);
        void set_current_thread(Thread *t);
        Thread * get_current_thread() const;
        void print() const;
@@ -35,7 +36,6 @@ public:
        void remove_sleep(Thread *t);
        void add_sleep(Thread *t);
        enabled_type_t get_enabled(const Thread *t) const;
-       void update_sleep_set(Node *n);
        bool is_enabled(const Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
        bool is_sleep_set(const Thread *t) const;
@@ -44,6 +44,7 @@ public:
 
        SNAPSHOTALLOC
 private:
+       ModelExecution *execution;
        /** The list of available Threads that are not currently running */
        enabled_type_t *enabled;
        int enabled_len;
@@ -54,4 +55,4 @@ private:
        Thread *current;
 };
 
-#endif /* __SCHEDULE_H__ */
+#endif /* __SCHEDULE_H__ */