projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3108149
)
model: move get_current_thread() implementation out of header
author
Brian Norris
<banorris@uci.edu>
Wed, 3 Oct 2012 20:16:00 +0000
(13:16 -0700)
committer
Brian Norris
<banorris@uci.edu>
Wed, 3 Oct 2012 20:39:01 +0000
(13:39 -0700)
model.cc
patch
|
blob
|
history
model.h
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index 6ec608038ecd348eac26dbec8ed4468da25a9b0c..9371b89676846d13d310412fb9ac4840c61862fb 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-99,6
+99,12
@@
int ModelChecker::get_num_threads()
return priv->next_thread_id;
}
return priv->next_thread_id;
}
+/** @return The currently executing Thread. */
+Thread * ModelChecker::get_current_thread()
+{
+ return scheduler->get_current_thread();
+}
+
/** @return a sequence number for a new ModelAction */
modelclock_t ModelChecker::get_next_seq_num()
{
/** @return a sequence number for a new ModelAction */
modelclock_t ModelChecker::get_next_seq_num()
{
diff --git
a/model.h
b/model.h
index 7241765d38c5270a33cf25a4986f5dd6fbd9a776..8e57876dabf3950e9cd3378eb15d50085a044d73 100644
(file)
--- a/
model.h
+++ b/
model.h
@@
-78,9
+78,7
@@
public:
thread_id_t get_next_id();
int get_num_threads();
thread_id_t get_next_id();
int get_num_threads();
-
- /** @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);