projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: make scheduler private
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 2b878b3f3ae71b475db5466c27b2c817b1118506..86e0b1e7b05a8174a05d8a3f28dc7132432962d5 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-36,9
+36,6
@@
public:
ModelChecker(struct model_params params);
~ModelChecker();
ModelChecker(struct model_params params);
~ModelChecker();
- /** The scheduler to use: tracks the running/ready Threads */
- Scheduler *scheduler;
-
/** Stores the context for the main model-checking system thread (call
* once)
* @param ctxt The system context structure
/** Stores the context for the main model-checking system thread (call
* once)
* @param ctxt The system context structure
@@
-63,6
+60,9
@@
public:
int get_num_threads();
modelclock_t get_next_seq_num();
int get_num_threads();
modelclock_t get_next_seq_num();
+ /** @return The currently executing Thread. */
+ Thread * get_current_thread() { return scheduler->get_current_thread(); }
+
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
int switch_to_master(ModelAction *act);
ClockVector * get_cv(thread_id_t tid);
bool next_execution();
@@
-74,6
+74,9
@@
public:
MEMALLOC
private:
MEMALLOC
private:
+ /** The scheduler to use: tracks the running/ready Threads */
+ Scheduler *scheduler;
+
int next_thread_id;
modelclock_t used_sequence_numbers;
int num_executions;
int next_thread_id;
modelclock_t used_sequence_numbers;
int num_executions;