projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Annotation Support
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index cfc652866da765899fa3e6f452b3403fa6bcc03b..74cb4e1f29aaf2c649fce027fc9dd10c714eb562 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-50,15
+50,13
@@
public:
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context() { return &system_context; }
/** @returns the context for the main model-checking system thread */
ucontext_t * get_system_context() { return &system_context; }
- const ModelExecution * get_execution() const { return execution; }
+ ModelExecution * get_execution() const { return execution; }
+
+ int get_execution_number() const { return execution_number; }
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
Thread * get_thread(thread_id_t tid) const;
Thread * get_thread(const ModelAction *act) const;
- bool is_enabled(Thread *t) const;
- bool is_enabled(thread_id_t tid) const;
-
- unsigned int get_num_threads() const;
Thread * get_current_thread() const;
void switch_from_master(Thread *thread);
Thread * get_current_thread() const;
void switch_from_master(Thread *thread);
@@
-69,12
+67,9
@@
public:
const model_params params;
void add_trace_analysis(TraceAnalysis *a) {
const model_params params;
void add_trace_analysis(TraceAnalysis *a) {
- trace_analyses
->
push_back(a);
+ trace_analyses
.
push_back(a);
}
}
- action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
- ModelAction * get_last_action(thread_id_t tid) const;
-
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
MEMALLOC
private:
/** The scheduler to use: tracks the running/ready Threads */
@@
-82,6
+77,10
@@
private:
NodeStack * const node_stack;
ModelExecution *execution;
NodeStack * const node_stack;
ModelExecution *execution;
+ int execution_number;
+
+ unsigned int get_num_threads() const;
+
void execute_sleep_set();
bool next_execution();
void execute_sleep_set();
bool next_execution();
@@
-96,7
+95,7
@@
private:
ucontext_t system_context;
ucontext_t system_context;
- ModelVector<TraceAnalysis *>
*
trace_analyses;
+ ModelVector<TraceAnalysis *> trace_analyses;
/** @brief The cumulative execution stats */
struct execution_stats stats;
/** @brief The cumulative execution stats */
struct execution_stats stats;