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
17a3df7
..
f329df4
100644
(file)
--- a/
src/kernel/context/ContextThread.cpp
+++ b/
src/kernel/context/ContextThread.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
21
. 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>
@@
-22,21
+23,23
@@
namespace context {
// ThreadContextFactory
// ThreadContextFactory
-ThreadContextFactory::ThreadContextFactory() : ContextFactory()
, parallel_(SIMIX_context_is_parallel())
+ThreadContextFactory::ThreadContextFactory() : ContextFactory()
{
{
- if (parallel_)
+ 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();
}
ThreadContextFactory::~ThreadContextFactory()
{
ParallelThreadContext::initialize();
}
ThreadContextFactory::~ThreadContextFactory()
{
- if (
parallel_
)
+ if (
SIMIX_context_is_parallel()
)
ParallelThreadContext::finalize();
}
ParallelThreadContext::finalize();
}
-ThreadContext* ThreadContextFactory::create_context(std::function<void()>
code, smx_actor_t
actor, bool maestro)
+ThreadContext* ThreadContextFactory::create_context(std::function<void()>
&& code, actor::ActorImpl*
actor, bool maestro)
{
{
- if (
parallel_
)
+ if (
SIMIX_context_is_parallel()
)
return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
else
return this->new_context<SerialThreadContext>(std::move(code), actor, maestro);
return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
else
return this->new_context<SerialThreadContext>(std::move(code), actor, maestro);
@@
-44,7
+47,7
@@
ThreadContext* ThreadContextFactory::create_context(std::function<void()> code,
void ThreadContextFactory::run_all()
{
void ThreadContextFactory::run_all()
{
- if (
parallel_
) {
+ if (
SIMIX_context_is_parallel()
) {
// Parallel execution
ParallelThreadContext::run_all();
} else {
// Parallel execution
ParallelThreadContext::run_all();
} else {
@@
-55,7
+58,7
@@
void ThreadContextFactory::run_all()
// ThreadContext
// ThreadContext
-ThreadContext::ThreadContext(std::function<void()>
code, smx_actor_t
actor, bool maestro)
+ThreadContext::ThreadContext(std::function<void()>
&& code, actor::ActorImpl*
actor, bool maestro)
: AttachContext(std::move(code), actor), is_maestro_(maestro)
{
/* If the user provided a function for the actor then use it */
: AttachContext(std::move(code), actor), is_maestro_(maestro)
{
/* If the user provided a function for the actor then use it */
@@
-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 unca
tched exception %s", simgrid::xbt::demangle(typeid(e).name()).get
());
+ XBT_INFO("Actor killed by an unca
ught 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 = (ThreadContext*)simix_global->maestro_process->context_
;
+
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 = (ThreadContext*)simix_global->maestro_process->context_
;
+
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_
);
+
auto* context = static_cast<ThreadContext*>(actor->context_.get()
);
context->release();
context->wait();
}
context->release();
context->wait();
}
@@
-205,9
+202,9
@@
void ParallelThreadContext::finalize()
void ParallelThreadContext::run_all()
{
for (smx_actor_t const& actor : simix_global->actors_to_run)
void ParallelThreadContext::run_all()
{
for (smx_actor_t const& actor : simix_global->actors_to_run)
- static_cast<ThreadContext*>(actor->context_)->release();
+ static_cast<ThreadContext*>(actor->context_
.get()
)->release();
for (smx_actor_t const& actor : simix_global->actors_to_run)
for (smx_actor_t const& actor : simix_global->actors_to_run)
- static_cast<ThreadContext*>(actor->context_)->wait();
+ static_cast<ThreadContext*>(actor->context_
.get()
)->wait();
}
void ParallelThreadContext::start_hook()
}
void ParallelThreadContext::start_hook()
@@
-227,4
+224,6
@@
XBT_PRIVATE ContextFactory* thread_factory()
XBT_VERB("Activating thread context factory");
return new ThreadContextFactory();
}
XBT_VERB("Activating thread context factory");
return new ThreadContextFactory();
}
-}}} // namespace
+} // namespace context
+} // namespace kernel
+} // namespace simgrid