XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-/**
- * @brief creates a new context for a user level process
- * @param code a main function
- * @param cleanup_func the function to call when the context stops
- * @param simix_process
- */
-smx_context_t SIMIX_context_new(
- std::function<void()> code,
- void_pfn_smxprocess_t cleanup_func,
- smx_actor_t simix_process)
-{
- return simix_global->context_factory->create_context(
- std::move(code), cleanup_func, simix_process);
-}
namespace simgrid {
namespace kernel {
ContextFactory::~ContextFactory() = default;
-static thread_local smx_context_t smx_current_context = nullptr;
+static thread_local Context* smx_current_context = nullptr;
Context* Context::self()
{
return smx_current_context;
#endif
}
-Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
+Context* ContextFactory::attach(actor::ActorImpl*)
{
xbt_die("Cannot attach with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context* ContextFactory::create_maestro(std::function<void()>, smx_actor_t)
+Context* ContextFactory::create_maestro(std::function<void()>&&, actor::ActorImpl*)
{
xbt_die("Cannot create_maestro with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\n");
}
-Context::Context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor)
- : code_(std::move(code)), cleanup_func_(cleanup_func), actor_(actor)
+Context::Context(std::function<void()>&& code, actor::ActorImpl* actor) : code_(std::move(code)), actor_(actor)
{
/* If no function was provided, this is the context for maestro
* and we should set it as the current context */
void Context::stop()
{
- actor_->finished_ = true;
-
- if (actor_->auto_restart_ && actor_->host_->is_off()) {
- XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart", actor_->host_->get_cname(),
- actor_->get_cname());
- watched_hosts.insert(actor_->host_->get_cname());
- }
-
- // Execute the termination callbacks
- smx_process_exit_status_t exit_status = (actor_->context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS;
- while (not actor_->on_exit.empty()) {
- s_smx_process_exit_fun_t exit_fun = actor_->on_exit.back();
- actor_->on_exit.pop_back();
- (exit_fun.fun)(exit_status, exit_fun.arg);
- }
-
- /* cancel non-blocking activities */
- for (auto activity : actor_->comms)
- boost::static_pointer_cast<activity::CommImpl>(activity)->cancel();
- actor_->comms.clear();
-
- XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(),
- actor_->pid_);
-
- if (this->cleanup_func_)
- this->cleanup_func_(this->actor_);
-
- this->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), because that's me
- simgrid::simix::simcall([this] {
- simgrid::s4u::Actor::on_destruction(actor_->iface());
-
- /* Unregister from the kill timer if any */
- if (actor_->kill_timer != nullptr) {
- SIMIX_timer_remove(actor_->kill_timer);
- actor_->kill_timer = nullptr;
- }
-
- SIMIX_process_cleanup(actor_);
- });
- this->iwannadie = true;
+ this->actor_->cleanup();
}
AttachContext::~AttachContext() = default;
-StopRequest::~StopRequest() = default;
-
-void StopRequest::do_throw()
-{
- throw StopRequest();
-}
-
-bool StopRequest::try_n_catch(std::function<void(void)> try_block)
-{
- bool res;
- try {
- try_block();
- res = true;
- } catch (StopRequest const&) {
- XBT_DEBUG("Caught a StopRequest");
- res = false;
- }
- return res;
-}
-}}}
+} // namespace context
+} // namespace kernel
+} // namespace simgrid
/** @brief Executes all the processes to run (in parallel if possible). */
void SIMIX_context_runall()
