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 3a54e8cfda9a55c2bcce5af72bc006bcf32a4588..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,18
+29,25
@@
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;
Thread * get_current_thread() const;
void print() const;
- enabled_type_t * get_enabled
() { return is_
enabled; };
+ enabled_type_t * get_enabled
_array() const { return
enabled; };
void remove_sleep(Thread *t);
void add_sleep(Thread *t);
void remove_sleep(Thread *t);
void add_sleep(Thread *t);
- enabled_type_t get_enabled(
Thread *t)
;
+ enabled_type_t get_enabled(
const Thread *t) const
;
void update_sleep_set(Node *n);
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:
/** The list of available Threads that are not currently running */
SNAPSHOTALLOC
private:
/** The list of available Threads that are not currently running */
- enabled_type_t *
is_
enabled;
+ enabled_type_t *enabled;
int enabled_len;
int curr_thread_index;
void set_enabled(Thread *t, enabled_type_t enabled_status);
int enabled_len;
int curr_thread_index;
void set_enabled(Thread *t, enabled_type_t enabled_status);