X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..20e80e0441190a30ffdce39c11e8a947fb9d63b5:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 7047bb2d0e..96aac00178 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -3,38 +3,25 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include -#include -#include - -#include - -#include "xbt/ex.hpp" -#include "xbt/functional.hpp" -#include "xbt/log.h" -#include "xbt/sysdep.h" -#include "xbt/utility.hpp" - -#include "simgrid/s4u/Host.hpp" - #include "mc/mc.h" - #include "smx_private.hpp" +#include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroIo.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_replay.hpp" #include "src/mc/remote/Client.hpp" -#include "src/msg/msg_private.hpp" +#include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_io_private.hpp" +#include "src/simix/smx_synchro_private.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" +#include "xbt/ex.hpp" #ifdef HAVE_SMPI #include "src/smpi/include/private.hpp" #endif +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); unsigned long simix_process_maxpid = 0; @@ -93,11 +80,11 @@ void SIMIX_process_cleanup(smx_actor_t process) if (comm->src_proc == process) { XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p", comm.get(), - comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc); + comm->detached, (int)comm->state_, comm->src_proc, comm->dst_proc); comm->src_proc = nullptr; } else if (comm->dst_proc == process) { - XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state, + XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p", comm.get(), (int)comm->state_, comm->src_proc, comm->dst_proc); comm->dst_proc = nullptr; @@ -179,7 +166,7 @@ void ActorImpl::daemonize() simgrid::s4u::Actor* ActorImpl::restart() { - XBT_DEBUG("Restarting process %s on %s", getCname(), host->getCname()); + XBT_DEBUG("Restarting process %s on %s", get_cname(), host->get_cname()); // retrieve the arguments of the old process // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? @@ -249,8 +236,8 @@ void ActorImpl::resume() smx_activity_t ActorImpl::sleep(double duration) { - if (host->isOff()) - THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->getCname()); + if (host->is_off()) + THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->get_cname()); simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; @@ -268,7 +255,7 @@ void create_maestro(std::function code) maestro = new simgrid::kernel::actor::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->name = ""; - maestro->userdata = nullptr; + maestro->setUserData(nullptr); if (not code) { maestro->context = SIMIX_context_new(std::function(), nullptr, maestro); @@ -305,10 +292,10 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v std::map* properties, smx_actor_t parent_process) { - XBT_DEBUG("Start process %s on host '%s'", name, host->getCname()); + XBT_DEBUG("Start process %s on host '%s'", name, host->get_cname()); - if (host->isOff()) { - XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->getCname()); + if (host->is_off()) { + XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->get_cname()); return nullptr; } @@ -319,7 +306,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v process->pid = simix_process_maxpid++; process->name = simgrid::xbt::string(name); process->host = host; - process->userdata = data; + process->setUserData(data); process->simcall.issuer = process; if (parent_process != nullptr) { @@ -334,7 +321,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) - process->setProperty(kv.first, kv.second); + process->set_property(kv.first, kv.second); /* Make sure that the process is initialized for simix, in case we are called from the Host::onCreation signal */ if (host->extension() == nullptr) @@ -347,15 +334,13 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); - /* Tracing the process creation */ - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(process->host->getName())->createChild(instr_pid(process->ciface()), "ACTOR"); + /* The onCreation() signal must be delayed until there, where the pid and everything is set */ simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes - simgrid::s4u::Actor::onCreation(tmp); + simgrid::s4u::Actor::on_creation(tmp); return process; } @@ -369,7 +354,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn sg_host_t host = sg_host_by_name(hostname); XBT_DEBUG("Attach process %s on host '%s'", name, hostname); - if (host->isOff()) { + if (host->is_off()) { XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, hostname); return nullptr; } @@ -379,7 +364,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn process->pid = simix_process_maxpid++; process->name = std::string(name); process->host = host; - process->userdata = data; + process->setUserData(data); process->simcall.issuer = process; if (parent_process != nullptr) { @@ -397,26 +382,28 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn /* Add properties */ if (properties != nullptr) for (auto const& kv : *properties) - process->setProperty(kv.first, kv.second); + process->set_property(kv.first, kv.second); /* Add the process to it's host process list */ host->extension()->process_list.push_back(*process); /* Now insert it in the global process list and in the process to run list */ simix_global->process_list[process->pid] = process; - XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); + XBT_DEBUG("Inserting %s(%s) in the to_run list", process->get_cname(), host->get_cname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); - /* Tracing the process creation */ - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::byName(process->host->getName())->createChild(instr_pid(process->ciface()), "ACTOR"); auto* context = dynamic_cast(process->context); if (not context) xbt_die("Not a suitable context"); context->attach_start(); + + /* The onCreation() signal must be delayed until there, where the pid and everything is set */ + simgrid::s4u::ActorPtr tmp = process->iface(); // Passing this directly to onCreation will lead to crashes + simgrid::s4u::Actor::on_creation(tmp); + return process; } @@ -460,13 +447,13 @@ void SIMIX_process_runall() void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { if (process->finished) { - XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->getCname(), - process->host->getCname()); + XBT_DEBUG("Ignoring request to kill process %s@%s that is already dead", process->get_cname(), + process->host->get_cname()); return; } - XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->getCname(), issuer->host->getCname(), process->getCname(), - process->host->getCname()); + XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->get_cname(), issuer->host->get_cname(), + process->get_cname(), process->host->get_cname()); process->context->iwannadie = 1; process->blocked = 0; @@ -488,18 +475,18 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { - if (exec->surfAction_) { - exec->surfAction_->cancel(); - exec->surfAction_->unref(); - exec->surfAction_ = nullptr; + if (exec->surf_action_) { + exec->surf_action_->cancel(); + exec->surf_action_->unref(); + exec->surf_action_ = nullptr; } } else if (comm != nullptr) { process->comms.remove(process->waiting_synchro); comm->cancel(); // Remove first occurrence of &process->simcall: - auto i = boost::range::find(process->waiting_synchro->simcalls, &process->simcall); - if (i != process->waiting_synchro->simcalls.end()) - process->waiting_synchro->simcalls.remove(&process->simcall); + auto i = boost::range::find(process->waiting_synchro->simcalls_, &process->simcall); + if (i != process->waiting_synchro->simcalls_.end()) + process->waiting_synchro->simcalls_.remove(&process->simcall); } else if (sleep != nullptr) { SIMIX_process_sleep_destroy(process->waiting_synchro); @@ -540,8 +527,8 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(process->waiting_synchro); - if (exec != nullptr && exec->surfAction_) - exec->surfAction_->cancel(); + if (exec != nullptr && exec->surf_action_) + exec->surf_action_->cancel(); simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(process->waiting_synchro); @@ -578,10 +565,6 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const } -void simcall_HANDLER_process_killall(smx_simcall_t simcall) -{ - SIMIX_process_killall(simcall->issuer); -} /** * \brief Kills all running processes. * \param issuer this one will not be killed @@ -608,7 +591,7 @@ void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process) if (process != simcall->issuer) { SIMIX_simcall_answer(simcall); } else { - sync_suspend->simcalls.push_back(simcall); + sync_suspend->simcalls_.push_back(simcall); process->waiting_synchro = sync_suspend; process->waiting_synchro->suspend(); } @@ -660,7 +643,7 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, do return; } smx_activity_t sync = SIMIX_process_join(simcall->issuer, process, timeout); - sync->simcalls.push_back(simcall); + sync->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = sync; } @@ -672,7 +655,7 @@ smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, doubl [](void*, void* arg) { auto sleep = static_cast(arg); if (sleep->surf_sleep) - sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::done); + sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::FINISHED); intrusive_ptr_release(sleep); return 0; }, @@ -689,7 +672,7 @@ void simcall_HANDLER_process_sleep(smx_simcall_t simcall, double duration) return; } smx_activity_t sync = simcall->issuer->sleep(duration); - sync->simcalls.push_back(simcall); + sync->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = sync; } @@ -714,7 +697,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro) */ void SIMIX_process_yield(smx_actor_t self) { - XBT_DEBUG("Yield actor '%s'", self->getCname()); + XBT_DEBUG("Yield actor '%s'", self->get_cname()); /* Go into sleep and return control to maestro */ self->context->suspend(); @@ -728,12 +711,12 @@ void SIMIX_process_yield(smx_actor_t self) /* execute the on_exit functions */ SIMIX_process_on_exit_runall(self); /* Add the process to the list of process to restart, only if the host is down */ - if (self->auto_restart && self->host->isOff()) { - SIMIX_host_add_auto_restart_process(self->host, self->getCname(), self->code, self->userdata, - SIMIX_timer_get_date(self->kill_timer), self->getProperties(), + if (self->auto_restart && self->host->is_off()) { + SIMIX_host_add_auto_restart_process(self->host, self->get_cname(), self->code, self->getUserData(), + SIMIX_timer_get_date(self->kill_timer), self->get_properties(), self->auto_restart); } - XBT_DEBUG("Process %s@%s is dead", self->getCname(), self->host->getCname()); + XBT_DEBUG("Process %s@%s is dead", self->get_cname(), self->host->get_cname()); self->context->stop(); } @@ -770,7 +753,7 @@ smx_actor_t SIMIX_process_from_PID(aid_t PID) } void SIMIX_process_on_exit_runall(smx_actor_t process) { - simgrid::s4u::Actor::onDestruction(process->iface()); + simgrid::s4u::Actor::on_destruction(process->iface()); smx_process_exit_status_t exit_status = (process->context->iwannadie) ? SMX_EXIT_FAILURE : SMX_EXIT_SUCCESS; while (not process->on_exit.empty()) { s_smx_process_exit_fun_t exit_fun = process->on_exit.back(); @@ -806,13 +789,11 @@ void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart) { * \param code the main function of the process * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can * be nullptr. - * It can be retrieved with the function \ref simcall_process_get_data. + * It can be retrieved with the method ActorImpl::getUserData(). * \param host where the new agent is executed. - * \param kill_time time when the process is killed * \param argc first argument passed to \a code * \param argv second argument passed to \a code * \param properties the properties of the process - * \param auto_restart either it is autorestarting or not. */ smx_actor_t simcall_process_create(const char* name, xbt_main_func_t code, void* data, sg_host_t host, int argc, char** argv, std::map* properties) @@ -833,7 +814,7 @@ smx_actor_t simcall_process_create(const char* name, std::function code, if (name == nullptr) name = ""; smx_actor_t self = SIMIX_process_self(); - return simgrid::simix::kernelImmediate([name, code, data, host, properties, self] { + return simgrid::simix::simcall([name, code, data, host, properties, self] { return SIMIX_process_create(name, std::move(code), data, host, properties, self); }); }