ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
try {
(*context)();
- } catch (simgrid::kernel::context::Context::StopRequest const&) {
+ context->Context::stop();
+ } catch (simgrid::kernel::context::StopRequest const&) {
XBT_DEBUG("Caught a StopRequest");
} catch (simgrid::Exception const& e) {
XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
throw;
}
- context->Context::stop();
ASAN_ONLY(context->asan_stop_ = true);
context->suspend();
}
this->uc_.uc_link = nullptr;
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
- ASAN_ONLY(this->asan_stack_ = static_cast<char*>(get_stack()) + smx_context_usable_stack_size);
-#else
- ASAN_ONLY(this->asan_stack_ = get_stack());
-#endif
// Makecontext expects integer arguments; we want to pass a pointer.
// This context address is decomposed into a serie of integers, which are passed as arguments to makecontext.
UContext* arg = this;
memcpy(ctx_addr, &arg, sizeof this);
makecontext(&this->uc_, (void (*)())smx_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]);
- }
#if SIMGRID_HAVE_MC
- if (MC_is_active() && has_code()) {
- MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_usable_stack_size);
- }
+ if (MC_is_active()) {
+ MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_usable_stack_size);
+ }
#endif
+ }
}
void UContext::swap_into(SwappedContext* to_)