projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: refactor the get_thread() selection
[model-checker.git]
/
schedule.h
diff --git
a/schedule.h
b/schedule.h
index d4780c884d672afd4b3eabc4e1fc22aaf30be289..c18953d44824d09782e1cd389becbb96c181fb4c 100644
(file)
--- a/
schedule.h
+++ b/
schedule.h
@@
-5,8
+5,8
@@
#ifndef __SCHEDULE_H__
#define __SCHEDULE_H__
#ifndef __SCHEDULE_H__
#define __SCHEDULE_H__
-#include <list>
#include "mymemory.h"
#include "mymemory.h"
+#include "modeltypes.h"
/* Forward declaration */
class Thread;
/* Forward declaration */
class Thread;
@@
-18,6
+18,8
@@
typedef enum enabled_type {
THREAD_SLEEP_SET
} enabled_type_t;
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 {
/** @brief The Scheduler class performs the mechanics of Thread execution
* scheduling. */
class Scheduler {
@@
-27,7
+29,8
@@
public:
void remove_thread(Thread *t);
void sleep(Thread *t);
void wake(Thread *t);
void remove_thread(Thread *t);
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; };
Thread * get_current_thread() const;
void print() const;
enabled_type_t * get_enabled_array() const { return enabled; };
@@
-37,6
+40,9
@@
public:
void update_sleep_set(Node *n);
bool is_enabled(const Thread *t) const;
bool is_enabled(thread_id_t tid) 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;
+ bool all_threads_sleeping() const;
+ void set_scheduler_thread(thread_id_t tid);
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private: