#include "ContextBoost.hpp"
#include "context_private.hpp"
+#include "simgrid/Exception.hpp"
#include "src/simix/smx_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
BoostContextFactory::BoostContextFactory()
: ContextFactory("BoostContextFactory"), parallel_(SIMIX_context_is_parallel())
{
- BoostContext::setMaestro(nullptr);
- if (parallel_) {
-#if HAVE_THREAD_CONTEXTS
+ BoostContext::set_maestro(nullptr);
+ if (parallel_)
ParallelBoostContext::initialize();
-#else
- xbt_die("No thread support for parallel context execution");
-#endif
- }
}
BoostContextFactory::~BoostContextFactory()
{
-#if HAVE_THREAD_CONTEXTS
if (parallel_)
ParallelBoostContext::finalize();
-#endif
}
smx_context_t BoostContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
smx_actor_t process)
{
-#if HAVE_THREAD_CONTEXTS
if (parallel_)
return this->new_context<ParallelBoostContext>(std::move(code), cleanup_func, process);
-#endif
-
return this->new_context<SerialBoostContext>(std::move(code), cleanup_func, process);
}
void BoostContextFactory::run_all()
{
-#if HAVE_THREAD_CONTEXTS
if (parallel_)
ParallelBoostContext::run_all();
else
-#endif
SerialBoostContext::run_all();
}
#endif
ASAN_ONLY(this->asan_stack_ = stack);
#if BOOST_VERSION < 106100
- this->fc_ = boost::context_::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
+ this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
#else
this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, BoostContext::wrapper);
#endif
} else {
#if BOOST_VERSION < 105600
- this->fc_ = new boost::context_::fcontext_t();
+ this->fc_ = new boost::context::fcontext_t();
#endif
if (BoostContext::maestro_context_ == nullptr)
BoostContext::maestro_context_ = this;
void BoostContext::wrapper(BoostContext::arg_type arg)
{
#if BOOST_VERSION < 106100
- BoostContext* context_ = reinterpret_cast<BoostContext*>(arg);
+ BoostContext* context = reinterpret_cast<BoostContext*>(arg);
#else
BoostContext* context = static_cast<BoostContext**>(arg.data)[1];
- ASAN_ONLY(xbt_assert(context_->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]));
- ASAN_FINISH_SWITCH(nullptr, &context_->asan_ctx_->asan_stack_, &context_->asan_ctx_->asan_stack_size_);
+ ASAN_ONLY(xbt_assert(context->asan_ctx_ == static_cast<BoostContext**>(arg.data)[0]));
+ ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
#endif
try {
(*context)();
- context->Context::stop();
} catch (StopRequest const&) {
XBT_DEBUG("Caught a StopRequest");
+ } catch (simgrid::Exception const& e) {
+ XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+ throw;
}
- ASAN_ONLY(context_->asan_stop_ = true);
+ context->Context::stop();
+ ASAN_ONLY(context->asan_stop_ = true);
context->suspend();
}
inline void BoostContext::swap(BoostContext* from, BoostContext* to)
{
#if BOOST_VERSION < 105600
- boost::context_::jump_fcontext(from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+ boost::context::jump_fcontext(from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
#elif BOOST_VERSION < 106100
- boost::context_::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
+ boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
#else
BoostContext* ctx[2] = {from, to};
ASAN_ONLY(void* fake_stack = nullptr);
} else {
/* all processes were run, return to maestro */
XBT_DEBUG("No more process to run");
- next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
+ next_context = static_cast<SerialBoostContext*>(BoostContext::get_maestro());
}
- SIMIX_context_set_current(next_context);
+ Context::set_current(next_context);
BoostContext::swap(this, next_context);
}
void SerialBoostContext::resume()
{
- SIMIX_context_set_current(this);
- BoostContext::swap(BoostContext::getMaestro(), this);
+ Context::set_current(this);
+ BoostContext::swap(BoostContext::get_maestro(), this);
}
void SerialBoostContext::run_all()
// ParallelBoostContext
-#if HAVE_THREAD_CONTEXTS
-
simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
-xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
+thread_local uintptr_t ParallelBoostContext::worker_id_;
std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
void ParallelBoostContext::initialize()
parmap_ = nullptr;
workers_context_.clear();
workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
- xbt_os_thread_key_create(&worker_id_key_);
}
void ParallelBoostContext::finalize()
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
- xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelBoostContext::run_all()
next_context = static_cast<ParallelBoostContext*>(next_work.get()->context_);
} else {
XBT_DEBUG("No more processes to run");
- uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
- next_context = workers_context_[worker_id];
+ next_context = workers_context_[worker_id_];
}
- SIMIX_context_set_current(next_context);
+ Context::set_current(next_context);
BoostContext::swap(this, next_context);
}
void ParallelBoostContext::resume()
{
- uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
- xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+ worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
- ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
- workers_context_[worker_id] = worker_context;
+ ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(self());
+ workers_context_[worker_id_] = worker_context;
- SIMIX_context_set_current(this);
+ Context::set_current(this);
BoostContext::swap(worker_context, this);
}
-#endif
XBT_PRIVATE ContextFactory* boost_factory()
{
