A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make simix_global->maestro_ private
[simgrid.git]
/
src
/
kernel
/
context
/
ContextThread.cpp
diff --git
a/src/kernel/context/ContextThread.cpp
b/src/kernel/context/ContextThread.cpp
index
7b25fc6
..
a29203f
100644
(file)
--- a/
src/kernel/context/ContextThread.cpp
+++ b/
src/kernel/context/ContextThread.cpp
@@
-157,7
+157,7
@@
void ThreadContext::suspend()
void ThreadContext::attach_start()
{
// We're breaking the layers here by depending on the upper layer:
void ThreadContext::attach_start()
{
// We're breaking the layers here by depending on the upper layer:
- auto* maestro = static_cast<ThreadContext*>(simix_global->
maestro_
->context_.get());
+ auto* maestro = static_cast<ThreadContext*>(simix_global->
get_maestro()
->context_.get());
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
@@
-168,7
+168,7
@@
void ThreadContext::attach_stop()
xbt_assert(not this->is_maestro());
this->yield();
xbt_assert(not this->is_maestro());
this->yield();
- auto* maestro = static_cast<ThreadContext*>(simix_global->
maestro_
->context_.get());
+ auto* maestro = static_cast<ThreadContext*>(simix_global->
get_maestro()
->context_.get());
maestro->end_.acquire();
Context::set_current(nullptr);
maestro->end_.acquire();
Context::set_current(nullptr);