X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c83ab2062e1f773aeb1ba070196632bd07d47ac..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/kernel/context/Context.cpp diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp index 855d11afd9..dbd49f793e 100644 --- a/src/kernel/context/Context.cpp +++ b/src/kernel/context/Context.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2021. 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. */ @@ -11,22 +11,9 @@ #include "src/simix/smx_private.hpp" #include "src/surf/surf_interface.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); +#include -/** - * @brief creates a new context for a user level process - * @param code a main function - * @param cleanup_func the function to call when the context stops - * @param simix_process - */ -smx_context_t SIMIX_context_new( - std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_actor_t simix_process) -{ - return simix_global->context_factory->create_context( - std::move(code), cleanup_func, simix_process); -} +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); namespace simgrid { namespace kernel { @@ -36,14 +23,28 @@ ContextFactoryInitializer factory_initializer = nullptr; ContextFactory::~ContextFactory() = default; -static thread_local smx_context_t smx_current_context = nullptr; +thread_local Context* Context::current_context_ = nullptr; + +#ifndef WIN32 +/* Install or disable alternate signal stack, for SIGSEGV handler. */ +int Context::install_sigsegv_stack(stack_t* old_stack, bool enable) +{ + static std::array sigsegv_stack; + stack_t stack; + stack.ss_sp = sigsegv_stack.data(); + stack.ss_size = sigsegv_stack.size(); + stack.ss_flags = enable ? 0 : SS_DISABLE; + return sigaltstack(&stack, old_stack); +} +#endif + Context* Context::self() { - return smx_current_context; + return current_context_; } void Context::set_current(Context* self) { - smx_current_context = self; + current_context_ = self; } void Context::declare_context(std::size_t size) @@ -55,20 +56,19 @@ void Context::declare_context(std::size_t size) #endif } -Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t) +Context* ContextFactory::attach(actor::ActorImpl*) { xbt_die("Cannot attach with this ContextFactory.\n" "Try using --cfg=contexts/factory:thread instead.\n"); } -Context* ContextFactory::create_maestro(std::function, smx_actor_t) +Context* ContextFactory::create_maestro(std::function&&, actor::ActorImpl*) { xbt_die("Cannot create_maestro with this ContextFactory.\n" "Try using --cfg=contexts/factory:thread instead.\n"); } -Context::Context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor) - : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor) +Context::Context(std::function&& code, actor::ActorImpl* actor) : code_(std::move(code)), actor_(actor) { /* If no function was provided, this is the context for maestro * and we should set it as the current context */ @@ -84,83 +84,11 @@ Context::~Context() void Context::stop() { - actor_->finished_ = true; - - if (actor_->auto_restart_ && actor_->host_->is_off()) { - XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(), - actor_->get_cname()); - watched_hosts.insert(actor_->host_->get_cname()); - } - - actor_->finished_ = true; - SIMIX_process_on_exit_runall(actor_); - - /* cancel non-blocking communications */ - while (not actor_->comms.empty()) { - smx_activity_t synchro = actor_->comms.front(); - actor_->comms.pop_front(); - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - - /* make sure no one will finish the comm after this process is destroyed, - * because src_proc or dst_proc would be an invalid pointer */ - - if (comm->src_proc == actor_) { - XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(), - comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc); - comm->src_proc = nullptr; - - } else if (comm->dst_proc == actor_) { - XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_, - comm->src_proc, comm->dst_proc); - comm->dst_proc = nullptr; - - if (comm->detached && comm->src_proc != nullptr) { - /* the comm will be freed right now, remove it from the sender */ - comm->src_proc->comms.remove(comm); - } - } else { - xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro.get()); - } - comm->cancel(); - } - - XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(), - actor_->pid_); - - if (this->cleanup_func_) - this->cleanup_func_(this->actor_); - - this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me - simgrid::simix::simcall([this] { SIMIX_process_cleanup(this->actor_); }); - this->iwannadie = true; + this->actor_->cleanup(); } AttachContext::~AttachContext() = default; -StopRequest::~StopRequest() = default; - -void StopRequest::do_throw() -{ - throw StopRequest(); -} - -bool StopRequest::try_n_catch(std::function try_block) -{ - bool res; - try { - try_block(); - res = true; - } catch (StopRequest const&) { - XBT_DEBUG("Caught a StopRequest"); - res = false; - } - return res; -} -}}} - -/** @brief Executes all the processes to run (in parallel if possible). */ -void SIMIX_context_runall() -{ - simix_global->context_factory->run_all(); -} +} // namespace context +} // namespace kernel +} // namespace simgrid