projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge demsky's SC analysis fixup
[model-checker.git]
/
model.h
diff --git
a/model.h
b/model.h
index 89d089d1051aafbcd95ae6cd4961c23f764be739..77db6aa79569c9611d1e296fa5fa2b4134f6e584 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-60,7
+60,6
@@
public:
bool is_enabled(Thread *t) const;
bool is_enabled(thread_id_t tid) 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);
@@
-74,9
+73,6
@@
public:
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 */
@@
-86,6
+82,8
@@
private:
int execution_number;
int execution_number;
+ unsigned int get_num_threads() const;
+
void execute_sleep_set();
bool next_execution();
void execute_sleep_set();
bool next_execution();