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
In C++, classes don't need a name because they have a class
[simgrid.git]
/
src
/
kernel
/
context
/
ContextUnix.cpp
diff --git
a/src/kernel/context/ContextUnix.cpp
b/src/kernel/context/ContextUnix.cpp
index
727ffb8
..
de67f76
100644
(file)
--- a/
src/kernel/context/ContextUnix.cpp
+++ b/
src/kernel/context/ContextUnix.cpp
@@
-30,37
+30,35
@@
namespace kernel {
namespace context {
// UContextFactory
namespace context {
// UContextFactory
-Context* UContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t
process
)
+Context* UContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t
actor
)
{
{
- return new_context<UContext>(std::move(code), cleanup,
process
, this);
+ return new_context<UContext>(std::move(code), cleanup,
actor
, this);
}
// UContext
}
// UContext
-UContext::UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
process
,
+UContext::UContext(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t
actor
,
SwappedContextFactory* factory)
SwappedContextFactory* factory)
- : SwappedContext(std::move(code), cleanup_func,
process
, factory)
+ : SwappedContext(std::move(code), cleanup_func,
actor
, factory)
{
/* if the user provided a function for the process then use it, otherwise it is the context for maestro */
if (has_code()) {
getcontext(&this->uc_);
this->uc_.uc_link = nullptr;
{
/* if the user provided a function for the process then use it, otherwise it is the context for maestro */
if (has_code()) {
getcontext(&this->uc_);
this->uc_.uc_link = nullptr;
- this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(
this->stack_
);
+ this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(
get_stack()
);
this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
#if PTH_STACKGROWTH == -1
this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
#if PTH_STACKGROWTH == -1
- ASAN_ONLY(this->asan_stack_ = static_cast<char*>(
this->stack_
) + smx_context_usable_stack_size);
+ ASAN_ONLY(this->asan_stack_ = static_cast<char*>(
get_stack()
) + smx_context_usable_stack_size);
#else
#else
- ASAN_ONLY(this->asan_stack_ =
this->stack_
);
+ ASAN_ONLY(this->asan_stack_ =
get_stack()
);
#endif
UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
#endif
UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
- } else {
- set_maestro(this); // save maestro for run_all()
}
#if SIMGRID_HAVE_MC
if (MC_is_active() && has_code()) {
}
#if SIMGRID_HAVE_MC
if (MC_is_active() && has_code()) {
- MC_register_stack_area(
this->stack_, process
, &(this->uc_), smx_context_usable_stack_size);
+ MC_register_stack_area(
get_stack(), actor
, &(this->uc_), smx_context_usable_stack_size);
}
#endif
}
}
#endif
}