projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
[model-checker.git]
/
schedule.h
diff --git
a/schedule.h
b/schedule.h
index fb4d082adc2dbe220baf49d8347fc70fe6c0d560..72670590dac3151bc9509ca2b5d60f2fe665c210 100644
(file)
--- a/
schedule.h
+++ b/
schedule.h
@@
-10,6
+10,13
@@
/* Forward declaration */
class Thread;
/* 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. */
/** @brief The Scheduler class performs the mechanics of Thread execution
* scheduling. */
@@
-23,15
+30,20
@@
public:
Thread * next_thread(Thread *t);
Thread * get_current_thread() const;
void print() const;
Thread * next_thread(Thread *t);
Thread * get_current_thread() const;
void print() const;
- bool * get_enabled() { return is_enabled; };
+ 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 */
SNAPSHOTALLOC
private:
/** The list of available Threads that are not currently running */
-
bool * is_
enabled;
+
enabled_type_t *
enabled;
int enabled_len;
int curr_thread_index;
int enabled_len;
int curr_thread_index;
- void set_enabled(Thread *t,
bool
enabled_status);
+ void set_enabled(Thread *t,
enabled_type_t
enabled_status);
/** The currently-running Thread */
Thread *current;
/** The currently-running Thread */
Thread *current;