X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=8e5554aec049ceee46f7bc1e4bf4cc9aa17b7c9f;hp=664b2d245bea0b05a3f072d9c0eb75146bdfaf0f;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=0accacf66b9f7bb4479205a0840f208dd8da6960

diff --git a/schedule.h b/schedule.h
index 664b2d24..8e5554ae 100644
--- a/schedule.h
+++ b/schedule.h
@@ -5,32 +5,55 @@
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <list>
 #include "mymemory.h"
+#include "modeltypes.h"
+#include "classlist.h"
 
-/* Forward declaration */
-class Thread;
+typedef enum enabled_type {
+	THREAD_DISABLED,
+	THREAD_ENABLED,
+	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 wait(Thread *wait, Thread *join);
+	void sleep(Thread *t);
 	void wake(Thread *t);
-	Thread * next_thread(Thread *t);
+	Thread * select_next_thread();
+	void set_current_thread(Thread *t);
 	Thread * get_current_thread() const;
 	void print() const;
+	enabled_type_t * get_enabled_array() const { return enabled; };
+	void remove_sleep(Thread *t);
+	void add_sleep(Thread *t);
+	enabled_type_t get_enabled(const Thread *t) const;
+	bool is_enabled(const Thread *t) const;
+	bool is_enabled(thread_id_t tid) const;
+	bool is_sleep_set(const Thread *t) const;
+	bool is_sleep_set(thread_id_t tid) const;
+	bool all_threads_sleeping() const;
+	void set_scheduler_thread(thread_id_t tid);
 
 	SNAPSHOTALLOC
 private:
+	ModelExecution *execution;
 	/** 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;
 };
 
-#endif /* __SCHEDULE_H__ */
+#endif	/* __SCHEDULE_H__ */