BoostContext::parallel_ = SIMIX_context_is_parallel();
if (BoostContext::parallel_) {
#if HAVE_THREAD_CONTEXTS
- int nthreads = SIMIX_context_get_nthreads();
- BoostContext::parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(nthreads, SIMIX_context_get_parallel_mode());
+ BoostContext::parmap_ = nullptr;
BoostContext::workers_context_.clear();
- BoostContext::workers_context_.resize(nthreads, nullptr);
+ BoostContext::workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
BoostContext::maestro_context_ = nullptr;
xbt_os_thread_key_create(&BoostContext::worker_id_key_);
#else
BoostContextFactory::~BoostContextFactory()
{
#if HAVE_THREAD_CONTEXTS
- if (BoostContext::parmap_) {
- delete BoostContext::parmap_;
- BoostContext::parmap_ = nullptr;
- }
+ delete BoostContext::parmap_;
+ BoostContext::parmap_ = nullptr;
BoostContext::workers_context_.clear();
#endif
}
#if HAVE_THREAD_CONTEXTS
if (BoostContext::parallel_) {
BoostContext::threads_working_ = 0;
+ if (not BoostContext::parmap_)
+ BoostContext::parmap_ =
+ new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
BoostContext::parmap_->apply(
[](smx_actor_t process) {
BoostContext* context = static_cast<BoostContext*>(process->context);
// BoostContext
-static void smx_ctx_boost_wrapper(std::intptr_t arg)
+void BoostContext::smx_ctx_boost_wrapper(BoostContext::ctx_arg_type arg)
{
- BoostContext* context = (BoostContext*)(arg);
- (*context)();
- context->stop();
+#if BOOST_VERSION < 106100
+ BoostContext* context = reinterpret_cast<BoostContext*>(arg);
+#else
+ static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
+ BoostContext* context = static_cast<BoostContext**>(arg.data)[1];
+#endif
+ try {
+ (*context)();
+ context->stop();
+ } catch (StopRequest) {
+ XBT_DEBUG("Caught a StopRequest");
+ }
+ context->suspend();
+}
+
+inline void BoostContext::smx_ctx_boost_jump_fcontext(BoostContext* from, BoostContext* to)
+{
+#if BOOST_VERSION < 105600
+ 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));
+#else
+ BoostContext* ctx[2] = {from, to};
+ boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);
+ static_cast<BoostContext**>(arg.data)[0]->fc_ = arg.fctx;
+#endif
}
BoostContext::BoostContext(std::function<void()> code,
#else
void* stack = this->stack_;
#endif
- this->fc_ = boost::context::make_fcontext(
- stack,
- smx_context_usable_stack_size,
- smx_ctx_boost_wrapper);
+#if BOOST_VERSION < 106100
+ this->fc_ = boost::context::make_fcontext(stack, smx_context_usable_stack_size, smx_ctx_boost_wrapper);
+#else
+ this->fc_ = boost::context::detail::make_fcontext(stack, smx_context_usable_stack_size, smx_ctx_boost_wrapper);
+#endif
} else {
-#if HAVE_BOOST_CONTEXTS == 1
+#if BOOST_VERSION < 105600
this->fc_ = new boost::context::fcontext_t();
#endif
if (BoostContext::maestro_context_ == nullptr)
BoostContext::~BoostContext()
{
-#if HAVE_BOOST_CONTEXTS == 1
+#if BOOST_VERSION < 105600
if (not this->stack_)
delete this->fc_;
#endif
void BoostContext::resume()
{
SIMIX_context_set_current(this);
-#if HAVE_BOOST_CONTEXTS == 1
- boost::context::jump_fcontext(maestro_context_->fc_, this->fc_, (intptr_t) this);
-#else
- boost::context::jump_fcontext(&maestro_context_->fc_, this->fc_, (intptr_t) this);
-#endif
+ smx_ctx_boost_jump_fcontext(maestro_context_, this);
}
void BoostSerialContext::suspend()
{
/* determine the next context */
- BoostSerialContext* next_context = nullptr;
- unsigned long int i = process_index_;
+ BoostSerialContext* next_context;
+ unsigned long int i = process_index_;
process_index_++;
if (i < simix_global->process_to_run.size()) {
XBT_DEBUG("No more process to run");
next_context = static_cast<BoostSerialContext*>(maestro_context_);
}
- SIMIX_context_set_current((smx_context_t) next_context);
-#if HAVE_BOOST_CONTEXTS == 1
- boost::context::jump_fcontext(this->fc_, next_context->fc_, (intptr_t) next_context);
-#else
- boost::context::jump_fcontext(&this->fc_, next_context->fc_, (intptr_t) next_context);
-#endif
+ SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+ smx_ctx_boost_jump_fcontext(this, next_context);
}
void BoostSerialContext::stop()
{
BoostContext::stop();
- this->suspend();
+ throw StopRequest();
}
// BoostParallelContext
next_context = static_cast<BoostParallelContext*>(next_work.get()->context);
} else {
XBT_DEBUG("No more processes to run");
- uintptr_t worker_id = (uintptr_t)xbt_os_thread_get_specific(worker_id_key_);
+ uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
next_context = static_cast<BoostParallelContext*>(workers_context_[worker_id]);
}
- SIMIX_context_set_current(static_cast<smx_context_t> (next_context));
-#if HAVE_BOOST_CONTEXTS == 1
- boost::context::jump_fcontext(this->fc_, next_context->fc_, (intptr_t)(next_context));
-#else
- boost::context::jump_fcontext(&this->fc_, next_context->fc_, (intptr_t)(next_context));
-#endif
+ SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+ smx_ctx_boost_jump_fcontext(this, next_context);
}
void BoostParallelContext::stop()
{
BoostContext::stop();
- this->suspend();
+ throw StopRequest();
}
void BoostParallelContext::resume()
{
uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1);
- xbt_os_thread_set_specific(worker_id_key_, (void*) worker_id);
+ xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
BoostParallelContext* worker_context = static_cast<BoostParallelContext*>(SIMIX_context_self());
workers_context_[worker_id] = worker_context;
SIMIX_context_set_current(this);
-#if HAVE_BOOST_CONTEXTS == 1
- boost::context::jump_fcontext(worker_context->fc_, this->fc_, (intptr_t) this);
-#else
- boost::context::jump_fcontext(&worker_context->fc_, this->fc_, (intptr_t) this);
-#endif
+ smx_ctx_boost_jump_fcontext(worker_context, this);
}
#endif