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 {
#endif
}
-Context* ContextFactory::attach(void_pfn_smxprocess_t, smx_actor_t)
+Context* ContextFactory::attach(smx_actor_t)
{
xbt_die("Cannot attach with this ContextFactory.\n"
"Try using --cfg=contexts/factory:thread instead.\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, smx_actor_t 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 */
{
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());
+ if (actor_->has_to_auto_restart() && not actor_->get_host()->is_on()) {
+ XBT_DEBUG("Insert host %s to watched_hosts because it's off and %s needs to restart",
+ actor_->get_host()->get_cname(), actor_->get_cname());
+ watched_hosts.insert(actor_->get_host()->get_name());
}
- actor_->finished_ = true;
-
// 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()) {
actor_->comms.clear();
XBT_DEBUG("%s@%s(%ld) should not run anymore", actor_->get_cname(), actor_->iface()->get_host()->get_cname(),
- actor_->pid_);
+ actor_->get_pid());
- if (this->cleanup_func_)
- this->cleanup_func_(this->actor_);
+ this->actor_->cleanup();
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());
- SIMIX_process_cleanup(actor_);
+
+ /* Unregister from the kill timer if any */
+ if (actor_->kill_timer != nullptr) {
+ actor_->kill_timer->remove();
+ actor_->kill_timer = nullptr;
+ }
+
+ actor_->cleanup();
});
this->iwannadie = true;
}