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
Save valgrind_stack_id in a private field.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextSwapped.cpp
diff --git
a/src/kernel/context/ContextSwapped.cpp
b/src/kernel/context/ContextSwapped.cpp
index
8226815
..
3d7740f
100644
(file)
--- a/
src/kernel/context/ContextSwapped.cpp
+++ b/
src/kernel/context/ContextSwapped.cpp
@@
-52,6
+52,7
@@
SwappedContext::SwappedContext(std::function<void()>&& code, smx_actor_t actor,
factory_->workers_context_[0] = this;
if (has_code()) {
factory_->workers_context_[0] = this;
if (has_code()) {
+ xbt_assert((smx_context_stack_size & 0xf) == 0, "smx_context_stack_size should be multiple of 16");
if (smx_context_guard_size > 0 && not MC_is_active()) {
#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1)
if (smx_context_guard_size > 0 && not MC_is_active()) {
#if !defined(PTH_STACKGROWTH) || (PTH_STACKGROWTH != -1)
@@
-97,13
+98,13
@@
SwappedContext::SwappedContext(std::function<void()>&& code, smx_actor_t actor,
}
#if PTH_STACKGROWTH == -1
}
#if PTH_STACKGROWTH == -1
- ASAN_ONLY(this->asan_stack_ = this->stack_ + smx_context_
usable_
stack_size);
+ ASAN_ONLY(this->asan_stack_ = this->stack_ + smx_context_stack_size);
#else
ASAN_ONLY(this->asan_stack_ = this->stack_);
#endif
#if HAVE_VALGRIND_H
#else
ASAN_ONLY(this->asan_stack_ = this->stack_);
#endif
#if HAVE_VALGRIND_H
- unsigned int valgrind_stack_id = VALGRIND_STACK_REGISTER(this->stack_, this->stack_ + smx_context_stack_size);
-
memcpy(this->stack_ + smx_context_usable_stack_size, &valgrind_stack_id, sizeof valgrind_stack_id
);
+ if (RUNNING_ON_VALGRIND)
+
this->valgrind_stack_id_ = VALGRIND_STACK_REGISTER(this->stack_, this->stack_ + smx_context_stack_size
);
#endif
}
}
#endif
}
}
@@
-114,9
+115,8
@@
SwappedContext::~SwappedContext()
return;
#if HAVE_VALGRIND_H
return;
#if HAVE_VALGRIND_H
- unsigned int valgrind_stack_id;
- memcpy(&valgrind_stack_id, stack_ + smx_context_usable_stack_size, sizeof valgrind_stack_id);
- VALGRIND_STACK_DEREGISTER(valgrind_stack_id);
+ if (RUNNING_ON_VALGRIND)
+ VALGRIND_STACK_DEREGISTER(valgrind_stack_id_);
#endif
#ifndef _WIN32
#endif
#ifndef _WIN32