nodestack: improve bounds-checking assertion

[model-checker.git] / schedule.h

diff --git a/schedule.h b/schedule.h
index 7875e0b6e24147c5e526b58ace7a580bc53c79c3..72670590dac3151bc9509ca2b5d60f2fe665c210 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -10,6 +10,13 @@
 
 /* Forward declaration */
 class Thread;
+class Node;
+
+typedef enum enabled_type {
+       THREAD_DISABLED,
+       THREAD_ENABLED,
+       THREAD_SLEEP_SET
+} enabled_type_t;
 
 /** @brief The Scheduler class performs the mechanics of Thread execution
  * scheduling. */
@@ -18,17 +25,25 @@ public:
        Scheduler();
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
-       void wait(Thread *wait, Thread *join);
        void sleep(Thread *t);
        void wake(Thread *t);
        Thread * next_thread(Thread *t);
        Thread * get_current_thread() const;
        void print() const;
+       enabled_type_t * get_enabled() { return enabled; };
+       void remove_sleep(Thread *t);
+       void add_sleep(Thread *t);
+       enabled_type_t get_enabled(Thread *t);
+       void update_sleep_set(Node *n);
+       bool is_enabled(Thread *t) const;
 
        SNAPSHOTALLOC
 private:
        /** The list of available Threads that are not currently running */
-       std::list<Thread *> readyList;
+       enabled_type_t *enabled;
+       int enabled_len;
+       int curr_thread_index;
+       void set_enabled(Thread *t, enabled_type_t enabled_status);
 
        /** The currently-running Thread */
        Thread *current;