ParallelThreadContext::finalize();
}
-ThreadContext* ThreadContextFactory::create_context(std::function<void()> code, smx_actor_t actor, bool maestro)
+ThreadContext* ThreadContextFactory::create_context(std::function<void()>&& code, smx_actor_t actor, bool maestro)
{
if (parallel_)
return this->new_context<ParallelThreadContext>(std::move(code), actor, maestro);
// ThreadContext
-ThreadContext::ThreadContext(std::function<void()> code, smx_actor_t actor, bool maestro)
+ThreadContext::ThreadContext(std::function<void()>&& code, smx_actor_t actor, bool maestro)
: AttachContext(std::move(code), actor), is_maestro_(maestro)
{
/* If the user provided a function for the actor then use it */
}
}
-void *ThreadContext::wrapper(void *param)
+void ThreadContext::wrapper(ThreadContext* context)
{
- ThreadContext* context = static_cast<ThreadContext*>(param);
Context::set_current(context);
#ifndef WIN32
#endif
XBT_DEBUG("Terminating");
Context::set_current(nullptr);
- return nullptr;
}
void ThreadContext::release()
void ThreadContext::attach_start()
{
// We're breaking the layers here by depending on the upper layer:
- ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
+ ThreadContext* maestro = static_cast<ThreadContext*>(simix_global->maestro_process->context_.get());
maestro->begin_.release();
xbt_assert(not this->is_maestro());
this->start();
xbt_assert(not this->is_maestro());
this->yield();
- ThreadContext* maestro = (ThreadContext*)simix_global->maestro_process->context_;
+ ThreadContext* maestro = static_cast<ThreadContext*>(simix_global->maestro_process->context_.get());
maestro->end_.acquire();
Context::set_current(nullptr);
{
for (smx_actor_t const& actor : simix_global->actors_to_run) {
XBT_DEBUG("Handling %p", actor);
- ThreadContext* context = static_cast<ThreadContext*>(actor->context_);
+ ThreadContext* context = static_cast<ThreadContext*>(actor->context_.get());
context->release();
context->wait();
}
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)
- static_cast<ThreadContext*>(actor->context_)->wait();
+ static_cast<ThreadContext*>(actor->context_.get())->wait();
}
void ParallelThreadContext::start_hook()