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
Drop simgrid::xbt::demangle and use boost::core::demangle instead.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextThread.cpp
diff --git
a/src/kernel/context/ContextThread.cpp
b/src/kernel/context/ContextThread.cpp
index
798b050
..
f329df4
100644
(file)
--- a/
src/kernel/context/ContextThread.cpp
+++ b/
src/kernel/context/ContextThread.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-202
1
. 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. */
/* 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. */
@@
-11,6
+11,7
@@
#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
#include "xbt/function_types.h"
#include "src/xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */
#include "xbt/function_types.h"
+#include <boost/core/demangle.hpp>
#include <functional>
#include <utility>
#include <functional>
#include <utility>
@@
-24,6
+25,8
@@
namespace context {
ThreadContextFactory::ThreadContextFactory() : ContextFactory()
{
ThreadContextFactory::ThreadContextFactory() : ContextFactory()
{
+ if (smx_context_stack_size != 8 * 1024 * 1024)
+ XBT_INFO("Stack size modifications are ignored by thread factory.");
if (SIMIX_context_is_parallel())
ParallelThreadContext::initialize();
}
if (SIMIX_context_is_parallel())
ParallelThreadContext::initialize();
}
@@
-85,12
+88,7
@@
void ThreadContext::wrapper(ThreadContext* context)
Context::set_current(context);
#ifndef WIN32
Context::set_current(context);
#ifndef WIN32
- /* Install alternate signal stack, for SIGSEGV handler. */
- stack_t stack;
- stack.ss_sp = sigsegv_stack;
- stack.ss_size = sizeof sigsegv_stack;
- stack.ss_flags = 0;
- sigaltstack(&stack, nullptr);
+ install_sigsegv_stack(nullptr, true);
#endif
// Tell the caller (normally the maestro) we are starting, and wait for its green light
context->end_.release();
#endif
// Tell the caller (normally the maestro) we are starting, and wait for its green light
context->end_.release();
@@
-106,15
+104,14
@@
void ThreadContext::wrapper(ThreadContext* context)
XBT_DEBUG("Caught a ForcefulKillException in Thread::wrapper");
xbt_assert(not context->is_maestro(), "Maestro shall not receive ForcefulKillExceptions, even when detached.");
} catch (simgrid::Exception const& e) {
XBT_DEBUG("Caught a ForcefulKillException in Thread::wrapper");
xbt_assert(not context->is_maestro(), "Maestro shall not receive ForcefulKillExceptions, even when detached.");
} catch (simgrid::Exception const& e) {
- XBT_INFO("Actor killed by an uncaught exception %s",
simgrid::xbt::demangle(typeid(e).name()).get
());
+ XBT_INFO("Actor killed by an uncaught exception %s",
boost::core::demangle(typeid(e).name()).c_str
());
throw;
}
// Signal to the caller (normally the maestro) that we have finished:
context->yield();
#ifndef WIN32
throw;
}
// Signal to the caller (normally the maestro) that we have finished:
context->yield();
#ifndef WIN32
- stack.ss_flags = SS_DISABLE;
- sigaltstack(&stack, nullptr);
+ install_sigsegv_stack(nullptr, false);
#endif
XBT_DEBUG("Terminating");
Context::set_current(nullptr);
#endif
XBT_DEBUG("Terminating");
Context::set_current(nullptr);
@@
-158,7
+155,7
@@
void ThreadContext::suspend()
void ThreadContext::attach_start()
{
// We're breaking the layers here by depending on the upper layer:
void ThreadContext::attach_start()
{
// We're breaking the layers here by depending on the upper layer:
-
ThreadContext
* maestro = static_cast<ThreadContext*>(simix_global->maestro_->context_.get());
+
auto
* maestro = static_cast<ThreadContext*>(simix_global->maestro_->context_.get());
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
@@
-169,7
+166,7
@@
void ThreadContext::attach_stop()
xbt_assert(not this->is_maestro());
this->yield();
xbt_assert(not this->is_maestro());
this->yield();
-
ThreadContext
* maestro = static_cast<ThreadContext*>(simix_global->maestro_->context_.get());
+
auto
* maestro = static_cast<ThreadContext*>(simix_global->maestro_->context_.get());
maestro->end_.acquire();
Context::set_current(nullptr);
maestro->end_.acquire();
Context::set_current(nullptr);
@@
-181,7
+178,7
@@
void SerialThreadContext::run_all()
{
for (smx_actor_t const& actor : simix_global->actors_to_run) {
XBT_DEBUG("Handling %p", actor);
{
for (smx_actor_t const& actor : simix_global->actors_to_run) {
XBT_DEBUG("Handling %p", actor);
-
ThreadContext
* context = static_cast<ThreadContext*>(actor->context_.get());
+
auto
* context = static_cast<ThreadContext*>(actor->context_.get());
context->release();
context->wait();
}
context->release();
context->wait();
}