X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.h;h=f9660232a0294360952c05028620317f28a41bf6;hp=86e4e40da18c5bc41bfd3908d76b4c48dc80b20b;hb=5379cc6b0f28d0563a51ad2f2069db83ec33ccac;hpb=5e2338d51de26e3ea875587f62b095c5d0111ae2

diff --git a/schedule.h b/schedule.h
index 86e4e40d..f9660232 100644
--- a/schedule.h
+++ b/schedule.h
@@ -1,20 +1,58 @@
+/** @file schedule.h
+ *	@brief Thread scheduler.
+ */
+
 #ifndef __SCHEDULE_H__
 #define __SCHEDULE_H__
 
-#include <list>
+#include "mymemory.h"
+#include "modeltypes.h"
+#include "classlist.h"
+
+typedef enum enabled_type {
+	THREAD_DISABLED,
+	THREAD_ENABLED,
+	THREAD_SLEEP_SET
+} enabled_type_t;
 
-#include "threads.h"
-#include "model.h"
+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);
-	Thread * next_thread(void);
-	Thread * get_current_thread(void);
-	void print();
+	void remove_thread(Thread *t);
+	void sleep(Thread *t);
+	void wake(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 all_threads_sleeping() const;
+	void set_scheduler_thread(thread_id_t tid);
+
+	SNAPSHOTALLOC
 private:
-	std::list<Thread *> readyList;
+	ModelExecution *execution;
+	/** The list of available Threads that are not currently running */
+	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__ */