projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: don't include schedule.h
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 6f082c66a71653f7240fcf8102223f60845e870f..23c42ebb199a6ce30b5859b80ca8d5537038d0a3 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-10,7
+10,6
@@
#include <cstddef>
#include <ucontext.h>
#include <cstddef>
#include <ucontext.h>
-#include "schedule.h"
#include "mymemory.h"
#include "libthreads.h"
#include "threads.h"
#include "mymemory.h"
#include "libthreads.h"
#include "threads.h"
@@
-24,9
+23,10
@@
class NodeStack;
class CycleGraph;
class Promise;
class NodeStack;
class CycleGraph;
class Promise;
+class Scheduler;
/** @brief Shorthand for a list of release sequence heads */
/** @brief Shorthand for a list of release sequence heads */
-typedef std::vector< const ModelAction *, M
y
Alloc<const ModelAction *> > rel_heads_list_t;
+typedef std::vector< const ModelAction *, M
odel
Alloc<const ModelAction *> > rel_heads_list_t;
/**
* Model checker parameter structure. Holds run-time configuration options for
/**
* Model checker parameter structure. Holds run-time configuration options for
@@
-73,15
+73,12
@@
public:
void add_thread(Thread *t);
void remove_thread(Thread *t);
void add_thread(Thread *t);
void remove_thread(Thread *t);
- Thread * get_thread(thread_id_t tid)
{ return thread_map->get(id_to_int(tid)); }
- Thread * get_thread(ModelAction *act)
{ return get_thread(act->get_tid()); }
+ Thread * get_thread(thread_id_t tid)
;
+ Thread * get_thread(ModelAction *act)
;
thread_id_t get_next_id();
int get_num_threads();
thread_id_t get_next_id();
int get_num_threads();
- modelclock_t get_next_seq_num();
-
- /** @return The currently executing Thread. */
- Thread * get_current_thread() { return scheduler->get_current_thread(); }
+ Thread * get_current_thread();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
@@
-114,6
+111,8
@@
private:
int num_feasible_executions;
bool promises_expired();
int num_feasible_executions;
bool promises_expired();
+ modelclock_t get_next_seq_num();
+
/**
* Stores the ModelAction for the current thread action. Call this
* immediately before switching from user- to system-context to pass
/**
* Stores the ModelAction for the current thread action. Call this
* immediately before switching from user- to system-context to pass