projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execution: bugfix - backtrack seq-cst fences properly
[model-checker.git]
/
schedule.h
diff --git
a/schedule.h
b/schedule.h
index 035ee78caadcedfc3119939a8f29028c5e269de7..9b16a7a968f7dcd5f52be8e936467efec29b0c48 100644
(file)
--- a/
schedule.h
+++ b/
schedule.h
@@
-5,12
+5,13
@@
#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;
class Node;
/* Forward declaration */
class Thread;
class Node;
+class ModelExecution;
typedef enum enabled_type {
THREAD_DISABLED,
typedef enum enabled_type {
THREAD_DISABLED,
@@
-18,16
+19,21
@@
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 {
public:
Scheduler();
/** @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 sleep(Thread *t);
void wake(Thread *t);
void add_thread(Thread *t);
void remove_thread(Thread *t);
void sleep(Thread *t);
void wake(Thread *t);
- Thread * next_thread(Thread *t);
+ Thread * select_next_thread(Node *n);
+ 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; };
@@
-38,9
+44,12
@@
public:
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_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:
+ ModelExecution *execution;
/** The list of available Threads that are not currently running */
enabled_type_t *enabled;
int enabled_len;
/** The list of available Threads that are not currently running */
enabled_type_t *enabled;
int enabled_len;