X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15f9e0adbd11d2a0736440004a2f71ef9cfccab8..fba8541415ef6ede1b56f9b02918a9c4acfde8ad:/src/kernel/context/ContextRaw.cpp diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 622f5b48db..d493caec6e 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -13,11 +13,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); // Raw context routines -typedef void (*rawctx_entry_point_t)(void *); +typedef void (*rawctx_entry_point_t)(simgrid::kernel::context::RawContext*); typedef void* raw_stack_t; -extern "C" raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, - rawctx_entry_point_t entry_point, void* arg); +extern "C" raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, rawctx_entry_point_t entry_point, + simgrid::kernel::context::RawContext* arg); extern "C" void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context); // TODO, we should handle FP, MMX and the x87 control-word (for x86 and x86_64) @@ -167,13 +167,15 @@ __asm__ ( /* If you implement raw contexts for other processors, don't forget to update the definition of HAVE_RAW_CONTEXTS in tools/cmake/CompleteInFiles.cmake */ -raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, - rawctx_entry_point_t entry_point, void* arg) { - THROW_UNIMPLEMENTED; +raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, rawctx_entry_point_t entry_point, + simgrid::kernel::context::RawContext* arg) +{ + THROW_UNIMPLEMENTED; } -void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context) { - THROW_UNIMPLEMENTED; +void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context) +{ + THROW_UNIMPLEMENTED; } #endif @@ -186,53 +188,36 @@ namespace context { // RawContextFactory -Context* RawContextFactory::create_context(std::function code, void_pfn_smxprocess_t cleanup_func, - smx_actor_t process) +RawContext* RawContextFactory::create_context(std::function&& code, actor::ActorImpl* actor) { - if (parallel_) - return this->new_context(std::move(code), cleanup_func, process, this); - return this->new_context(std::move(code), cleanup_func, process, this); + return this->new_context(std::move(code), actor, this); } // RawContext -RawContext::RawContext(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process, - SwappedContextFactory* factory) - : SwappedContext(std::move(code), cleanup, process, factory) +RawContext::RawContext(std::function&& code, actor::ActorImpl* actor, SwappedContextFactory* factory) + : SwappedContext(std::move(code), actor, factory) { if (has_code()) { -#if PTH_STACKGROWTH == -1 - ASAN_ONLY(this->asan_stack_ = static_cast(this->stack_) + smx_context_usable_stack_size); -#else - ASAN_ONLY(this->asan_stack_ = this->stack_); -#endif - this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this); + this->stack_top_ = raw_makecontext(get_stack(), smx_context_stack_size, RawContext::wrapper, this); } else { - if (process != nullptr && get_maestro() == nullptr) - set_maestro(this); - if (MC_is_active()) { - XBT_ATTRIB_UNUSED RawContext* maestro = static_cast(get_maestro()); - MC_ignore_heap(&maestro->stack_top_, sizeof(maestro->stack_top_)); - } + if (MC_is_active()) + MC_ignore_heap(&stack_top_, sizeof(stack_top_)); } } -RawContext::~RawContext() = default; - -void RawContext::wrapper(void* arg) +void RawContext::wrapper(RawContext* context) { - RawContext* context = static_cast(arg); ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_); try { (*context)(); - } catch (StopRequest const&) { - XBT_DEBUG("Caught a StopRequest"); + context->Context::stop(); + } catch (ForcefulKillException const&) { + XBT_DEBUG("Caught a ForcefulKillException"); } catch (simgrid::Exception const& e) { - XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get()); + XBT_INFO("Actor killed by an uncaught exception %s", simgrid::xbt::demangle(typeid(e).name()).get()); throw; } - context->Context::stop(); - ASAN_ONLY(context->asan_stop_ = true); context->suspend(); } @@ -241,42 +226,10 @@ void RawContext::swap_into(SwappedContext* to_) { RawContext* to = static_cast(to_); ASAN_ONLY(void* fake_stack = nullptr); - ASAN_ONLY(to->asan_ctx_ = from); - ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); + ASAN_ONLY(to->asan_ctx_ = this); + ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_); raw_swapcontext(&this->stack_top_, to->stack_top_); - ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_); -} - -// ParallelRawContext - -void ParallelRawContext::suspend() -{ - /* determine the next context */ - boost::optional next_work = parmap_->next(); - SwappedContext* next_context; - if (next_work) { - /* there is a next process to resume */ - XBT_DEBUG("Run next process"); - next_context = static_cast(next_work.get()->context_); - } else { - /* all processes were run, go to the barrier */ - XBT_DEBUG("No more processes to run"); - next_context = workers_context_[worker_id_]; - XBT_DEBUG("Restoring worker stack %zu (working threads = %zu)", worker_id_, threads_working_.load()); - } - - Context::set_current(next_context); - this->swap_into(next_context); -} - -void ParallelRawContext::resume() -{ - worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed); - SwappedContext* worker_context = static_cast(self()); - workers_context_[worker_id_] = worker_context; - XBT_DEBUG("Saving worker stack %zu", worker_id_); - Context::set_current(this); - worker_context->swap_into(this); + ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_); } ContextFactory* raw_factory() @@ -284,4 +237,6 @@ ContextFactory* raw_factory() XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us."); return new RawContextFactory(); } -}}} +} // namespace context +} // namespace kernel +} // namespace simgrid