A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
context
/
ContextUnix.cpp
diff --git
a/src/kernel/context/ContextUnix.cpp
b/src/kernel/context/ContextUnix.cpp
index
882dd74
..
7515e93
100644
(file)
--- a/
src/kernel/context/ContextUnix.cpp
+++ b/
src/kernel/context/ContextUnix.cpp
@@
-1,21
+1,18
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
3
. 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 */
/* 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"
#include "simgrid/Exception.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
-#include "src/mc/mc
_ignore.hpp
"
-#include "src/
simix/smx_privat
e.hpp"
+#include "src/mc/mc
.h
"
+#include "src/
mc/remote/AppSid
e.hpp"
#include "ContextUnix.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;
/** Up to two integers may be needed to store a pointer on the system we target */
constexpr int CTX_ADDR_LEN = 2;
@@
-35,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<void()>&& code, actor::ActorImpl* actor)
// UContextFactory
UContext* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
@@
-51,36
+46,32
@@
UContext* UContextFactory::create_context(std::function<void()>&& code, actor::A
UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, SwappedContextFactory* factory)
: SwappedContext(std::move(code), actor, factory)
{
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());
/* 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;
// 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
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
}
}
#endif
}
}
-void UContext::swap_into(SwappedContext* to_)
+void UContext::swap_into
_for_real
(SwappedContext* to_)
{
const UContext* to = static_cast<UContext*>(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_);
swapcontext(&this->uc_, &to->uc_);
- ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_);
}
}
@@
-89,6
+80,4
@@
XBT_PRIVATE ContextFactory* sysv_factory()
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
XBT_VERB("Activating SYSV context factory");
return new UContextFactory();
}
-} // namespace context
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::context