X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e83563c24057fdb7f595cce8ce0a739f876ee29..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/kernel/context/ContextUnix.cpp?ds=sidebyside diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index 92a541f2a5..97e8a5170f 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -8,12 +8,11 @@ #include "mc/mc.h" #include "simgrid/Exception.hpp" #include "src/kernel/actor/ActorImpl.hpp" -#include "src/mc/mc_ignore.hpp" -#include "src/simix/smx_private.hpp" +#include "src/mc/remote/AppSide.hpp" #include "ContextUnix.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_context); /** Up to two integers may be needed to store a pointer on the system we target */ constexpr int CTX_ADDR_LEN = 2; @@ -33,9 +32,7 @@ XBT_ATTRIB_NORETURN static void sysv_ctx_wrapper(int i1, int i2) } } -namespace simgrid { -namespace kernel { -namespace context { +namespace simgrid::kernel::context { // UContextFactory UContext* UContextFactory::create_context(std::function&& code, actor::ActorImpl* actor) @@ -65,9 +62,8 @@ UContext::UContext(std::function&& code, actor::ActorImpl* actor, Swappe makecontext(&this->uc_, (void (*)())sysv_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]); #if SIMGRID_HAVE_MC - if (MC_is_active()) { - MC_register_stack_area(get_stack(), &(this->uc_), smx_context_stack_size); - } + if (MC_is_active()) + simgrid::mc::AppSide::get()->declare_stack(get_stack(), stack_size, &uc_); #endif } } @@ -84,6 +80,4 @@ XBT_PRIVATE ContextFactory* sysv_factory() XBT_VERB("Activating SYSV context factory"); return new UContextFactory(); } -} // namespace context -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::context