-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
/* \file UContext.cpp Context switching with ucontexts from System V */
-#include "context_private.hpp"
-
#include "mc/mc.h"
#include "simgrid/Exception.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory)
: SwappedContext(std::move(code), actor, factory)
{
+ XBT_VERB("Creating a context of stack %uMb", actor->get_stacksize() / 1024 / 1024);
/* if the user provided a function for the actor then use it. If not, nothing to do for maestro. */
if (has_code()) {
getcontext(&this->uc_);
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_stack_size);
+ this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(actor->get_stacksize());
// Makecontext expects integer arguments; we want to pass a pointer.
// This context address is decomposed into a series of integers, which are passed as arguments to makecontext.
int ctx_addr[CTX_ADDR_LEN]{};
UContext* arg = this;
- memcpy(ctx_addr, &arg, sizeof this);
+ memcpy(ctx_addr, &arg, sizeof arg);
makecontext(&this->uc_, (void (*)())sysv_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]);
#if SIMGRID_HAVE_MC
}
}
-void UContext::swap_into(SwappedContext* to_)
+void UContext::swap_into_for_real(SwappedContext* to_)
{
const UContext* to = static_cast<UContext*>(to_);
- ASAN_ONLY(void* fake_stack = nullptr);
- ASAN_ONLY(to_->asan_ctx_ = this);
- ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to_->asan_stack_, to_->asan_stack_size_);
swapcontext(&this->uc_, &to->uc_);
- ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_);
}