X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35e02c75e39b9d81ad7ab1a971e8627d396a8dac..f8498e93073ae2ad6e6e19571ecf52c9104edbd0:/src/kernel/actor/ActorImpl.cpp diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 4569badaab..af4a2b5844 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -33,7 +33,7 @@ static unsigned long simix_process_maxpid = 0; */ smx_actor_t SIMIX_process_self() { - smx_context_t self_context = simgrid::kernel::context::Context::self(); + simgrid::kernel::context::Context* self_context = simgrid::kernel::context::Context::self(); return (self_context != nullptr) ? self_context->get_actor() : nullptr; } @@ -110,8 +110,7 @@ ActorImplPtr ActorImpl::attach(const std::string& name, void* data, s4u::Host* h context->attach_start(); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - simgrid::s4u::ActorPtr tmp = actor->iface(); // Passing this directly to on_creation will lead to crashes - simgrid::s4u::Actor::on_creation(tmp); + simgrid::s4u::Actor::on_creation(*actor->ciface()); return ActorImplPtr(actor); } @@ -142,11 +141,11 @@ void ActorImpl::cleanup() } // Execute the termination callbacks - smx_process_exit_status_t exit_status = (context_->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; + bool failed = context_->iwannadie; while (not on_exit.empty()) { - s_smx_process_exit_fun_t exit_fun = on_exit.back(); + auto exit_fun = on_exit.back(); on_exit.pop_back(); - (exit_fun.fun)(exit_status, exit_fun.arg); + exit_fun(failed); } /* cancel non-blocking activities */ @@ -182,7 +181,7 @@ void ActorImpl::cleanup() simix_global->mutex.unlock(); context_->iwannadie = false; // don't let the simcall's yield() do a Context::stop(), to avoid infinite loops - simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(iface()); }); + simgrid::simix::simcall([this] { simgrid::s4u::Actor::on_destruction(*ciface()); }); context_->iwannadie = true; } @@ -208,8 +207,7 @@ void ActorImpl::exit() if (exec != nullptr && exec->surf_action_) { exec->cancel(); - exec->surf_action_->unref(); - exec->surf_action_ = nullptr; + exec->clean_action(); } else if (comm != nullptr) { comms.remove(waiting_synchro); comm->cancel(); @@ -218,8 +216,7 @@ void ActorImpl::exit() if (i != waiting_synchro->simcalls_.end()) waiting_synchro->simcalls_.remove(&simcall); } else if (sleep != nullptr) { - if (sleep->surf_action_) - sleep->surf_action_->cancel(); + sleep->cancel(); sleep->post(); } else if (raw != nullptr) { raw->finish(); @@ -227,8 +224,7 @@ void ActorImpl::exit() io->cancel(); } else { simgrid::kernel::activity::ActivityImplPtr activity = waiting_synchro; - xbt_die("Activity %s is of unknown type %s", activity->get_cname(), - simgrid::xbt::demangle(typeid(activity).name()).get()); + xbt_die("Activity is of unknown type %s", simgrid::xbt::demangle(typeid(activity).name()).get()); } waiting_synchro = nullptr; @@ -279,18 +275,6 @@ double ActorImpl::get_kill_time() return kill_timer ? kill_timer->get_date() : 0; } -static void dying_daemon(int /*exit_status*/, void* data) -{ - std::vector* vect = &simix_global->daemons; - - auto it = std::find(vect->begin(), vect->end(), static_cast(data)); - xbt_assert(it != vect->end(), "The dying daemon is not a daemon after all. Please report that bug."); - - /* Don't move the whole content since we don't really care about the order */ - std::swap(*it, vect->back()); - vect->pop_back(); -} - void ActorImpl::yield() { XBT_DEBUG("Yield actor '%s'", get_cname()); @@ -302,7 +286,6 @@ void ActorImpl::yield() XBT_DEBUG("Control returned to me: '%s'", get_cname()); if (context_->iwannadie) { - XBT_DEBUG("Actor %s@%s is dead", get_cname(), host_->get_cname()); // throw simgrid::kernel::context::ForcefulKillException(); Does not seem to properly kill the actor context_->stop(); @@ -335,7 +318,15 @@ void ActorImpl::daemonize() if (not daemon_) { daemon_ = true; simix_global->daemons.push_back(this); - SIMIX_process_on_exit(this, dying_daemon, this); + SIMIX_process_on_exit(this, [this](bool) { + auto& vect = simix_global->daemons; + auto it = std::find(vect.begin(), vect.end(), this); + xbt_assert(it != vect.end(), "The dying daemon is not a daemon after all. Please report that bug."); + + /* Don't move the whole content since we don't really care about the order */ + std::swap(*it, vect.back()); + vect.pop_back(); + }); } } @@ -377,7 +368,9 @@ activity::ActivityImplPtr ActorImpl::suspend(ActorImpl* issuer) return nullptr; } else { - return activity::ExecImplPtr(new activity::ExecImpl("suspend", ""))->set_host(host_)->start(0.0, 1.0, 0.0); + activity::ExecImpl* exec = new activity::ExecImpl(); + (*exec).set_name("suspend").set_host(host_).set_flops_amount(0.0).start(); + return activity::ExecImplPtr(exec); } } @@ -403,17 +396,12 @@ void ActorImpl::resume() activity::ActivityImplPtr ActorImpl::join(ActorImpl* actor, double timeout) { - activity::ActivityImplPtr res = this->sleep(timeout); - intrusive_ptr_add_ref(res.get()); - SIMIX_process_on_exit(actor, - [](int, void* arg) { - auto sleep = static_cast(arg); - if (sleep->surf_action_) - sleep->surf_action_->finish(resource::Action::State::FINISHED); - intrusive_ptr_release(sleep); - }, - res.get()); - return res; + activity::ActivityImplPtr sleep = this->sleep(timeout); + SIMIX_process_on_exit(actor, [sleep](bool) { + if (sleep->surf_action_) + sleep->surf_action_->finish(resource::Action::State::FINISHED); + }); + return sleep; } activity::ActivityImplPtr ActorImpl::sleep(double duration) @@ -422,11 +410,9 @@ activity::ActivityImplPtr ActorImpl::sleep(double duration) throw_exception(std::make_exception_ptr(simgrid::HostFailureException( XBT_THROW_POINT, std::string("Host ") + host_->get_cname() + " failed, you cannot sleep there."))); - return activity::SleepImplPtr(new activity::SleepImpl()) - ->set_name("sleep") - ->set_host(host_) - ->set_duration(duration) - ->start(); + activity::SleepImpl* sleep = new activity::SleepImpl(); + (*sleep).set_name("sleep").set_host(host_).set_duration(duration).start(); + return activity::SleepImplPtr(sleep); } void ActorImpl::throw_exception(std::exception_ptr e) @@ -451,7 +437,7 @@ void ActorImpl::throw_exception(std::exception_ptr e) activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(waiting_synchro); if (sleep != nullptr) { - SIMIX_process_sleep_destroy(sleep); + sleep->clean_action(); if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), this) == end(simix_global->actors_to_run) && this != SIMIX_process_self()) { @@ -487,7 +473,7 @@ ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) intrusive_ptr_add_ref(actor); /* The on_creation() signal must be delayed until there, where the pid and everything is set */ - s4u::Actor::on_creation(actor->iface()); + s4u::Actor::on_creation(*actor->ciface()); return ActorImplPtr(actor); } @@ -602,7 +588,7 @@ void SIMIX_process_throw(smx_actor_t actor, xbt_errcat_t cat, int value, const c simgrid::kernel::activity::SleepImplPtr sleep = boost::dynamic_pointer_cast(actor->waiting_synchro); if (sleep != nullptr) { - SIMIX_process_sleep_destroy(sleep); + sleep->clean_action(); if (std::find(begin(simix_global->actors_to_run), end(simix_global->actors_to_run), actor) == end(simix_global->actors_to_run) && actor != SIMIX_process_self()) { @@ -703,16 +689,6 @@ void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) simcall->issuer->waiting_synchro = sync; } -void SIMIX_process_sleep_destroy(simgrid::kernel::activity::SleepImplPtr sleep) -{ - XBT_DEBUG("Destroy sleep synchro %p", sleep.get()); - - if (sleep->surf_action_) { - sleep->surf_action_->unref(); - sleep->surf_action_ = nullptr; - } -} - /** * @brief Calling this function makes the process to yield. * @@ -738,14 +714,21 @@ smx_actor_t SIMIX_process_from_PID(aid_t PID) void SIMIX_process_on_exit(smx_actor_t actor, int_f_pvoid_pvoid_t fun, void* data) { - SIMIX_process_on_exit(actor, [fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data); + SIMIX_process_on_exit(actor, [fun, data](bool failed) { + intptr_t status = failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; + fun(reinterpret_cast(status), data); + }); +} + +void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) +{ + SIMIX_process_on_exit(actor, [fun, data](bool failed) { fun(failed ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS, data); }); } -void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun, void* data) +void SIMIX_process_on_exit(smx_actor_t actor, const std::function& fun) { xbt_assert(actor, "current process not found: are you in maestro context ?"); - - actor->on_exit.emplace_back(s_smx_process_exit_fun_t{fun, data}); + actor->on_exit.emplace_back(fun); } /** @brief Restart a process, starting it again from the beginning. */