X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59378580f8bb437fd2a9ed435f7cad27e76c338f..5e7d79b763a5f55d1afb579d2b5a8d30ccfe869c:/src/simix/ActorImpl.cpp diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 4e82f6b570..bf3a1bf874 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -145,7 +145,9 @@ void SIMIX_process_empty_trash() } namespace simgrid { -namespace simix { + +namespace kernel { +namespace actor { ActorImpl::~ActorImpl() { @@ -181,7 +183,7 @@ simgrid::s4u::Actor* ActorImpl::restart() // retrieve the arguments of the old process // FIXME: Factorize this with SIMIX_host_add_auto_restart_process ? - simgrid::simix::ProcessArg arg; + simgrid::kernel::actor::ProcessArg arg; arg.name = name; arg.code = code; arg.host = host; @@ -221,7 +223,7 @@ smx_activity_t ActorImpl::suspend(ActorImpl* issuer) return nullptr; } else { - return SIMIX_execution_start(this, "suspend", 0.0, 1.0, 0.0); + return SIMIX_execution_start("suspend", 0.0, 1.0, 0.0, this->host); } } @@ -253,7 +255,7 @@ smx_activity_t ActorImpl::sleep(double duration) simgrid::kernel::activity::SleepImpl* synchro = new simgrid::kernel::activity::SleepImpl(); synchro->host = host; synchro->surf_sleep = host->pimpl_cpu->sleep(duration); - synchro->surf_sleep->setData(synchro); + synchro->surf_sleep->set_data(synchro); XBT_DEBUG("Create sleep synchronization %p", synchro); return synchro; @@ -263,7 +265,7 @@ void create_maestro(std::function code) { smx_actor_t maestro = nullptr; /* Create maestro process and initialize it */ - maestro = new simgrid::simix::ActorImpl(); + maestro = new simgrid::kernel::actor::ActorImpl(); maestro->pid = simix_process_maxpid++; maestro->name = ""; maestro->userdata = nullptr; @@ -280,13 +282,14 @@ void create_maestro(std::function code) simix_global->maestro_process = maestro; } +} // namespace actor } } /** @brief Creates and runs the maestro process */ void SIMIX_maestro_create(void (*code)(void*), void* data) { - simgrid::simix::create_maestro(std::bind(code, data)); + simgrid::kernel::actor::create_maestro(std::bind(code, data)); } /** @@ -309,7 +312,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v return nullptr; } - smx_actor_t process = new simgrid::simix::ActorImpl(); + smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); xbt_assert(code && host != nullptr, "Invalid parameters"); /* Process data */ @@ -321,16 +324,6 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v if (parent_process != nullptr) { process->ppid = parent_process->pid; -/* SMPI process have their own data segment and each other inherit from their father */ -#if HAVE_SMPI - if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { - if (parent_process->pid != 0) { - process->segment_index = parent_process->segment_index; - } else { - process->segment_index = process->pid - 1; - } - } -#endif } process->code = code; @@ -347,7 +340,7 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v if (host->extension() == nullptr) host->extension_set(new simgrid::simix::Host()); - /* Add the process to its host process list */ + /* Add the process to its host's process list */ host->extension()->process_list.push_back(*process); XBT_DEBUG("Start context '%s'", process->name.c_str()); @@ -357,9 +350,12 @@ smx_actor_t SIMIX_process_create(const char* name, std::function code, v XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); simix_global->process_to_run.push_back(process); intrusive_ptr_add_ref(process); - /* Tracing the process creation */ - TRACE_msg_process_create(process->getName(), process->pid, process->host); + 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); return process; } @@ -378,7 +374,7 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn return nullptr; } - smx_actor_t process = new simgrid::simix::ActorImpl(); + smx_actor_t process = new simgrid::kernel::actor::ActorImpl(); /* Process data */ process->pid = simix_process_maxpid++; process->name = std::string(name); @@ -388,16 +384,6 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn if (parent_process != nullptr) { process->ppid = parent_process->pid; - /* SMPI process have their own data segment and each other inherit from their father */ -#if HAVE_SMPI - if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) { - if (parent_process->pid != 0) { - process->segment_index = parent_process->segment_index; - } else { - process->segment_index = process->pid - 1; - } - } -#endif } /* Process data for auto-restart */ @@ -420,11 +406,13 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn simix_global->process_list[process->pid] = process; XBT_DEBUG("Inserting %s(%s) in the to_run list", process->getCname(), host->getCname()); simix_global->process_to_run.push_back(process); + intrusive_ptr_add_ref(process); /* Tracing the process creation */ - TRACE_msg_process_create(process->getName(), process->pid, process->host); + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::byName(process->host->getName())->createChild(instr_pid(process->ciface()), "ACTOR"); - auto context = dynamic_cast(process->context); + auto* context = dynamic_cast(process->context); if (not context) xbt_die("Not a suitable context"); @@ -434,14 +422,13 @@ smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostn void SIMIX_process_detach() { - auto context = dynamic_cast(SIMIX_context_self()); + auto* context = dynamic_cast(SIMIX_context_self()); if (not context) xbt_die("Not a suitable context"); auto process = context->process(); simix_global->cleanup_process_function(process); context->attach_stop(); - delete process; } /** @@ -478,7 +465,8 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { return; } - XBT_DEBUG("Killing process %s@%s", process->getCname(), process->host->getCname()); + XBT_DEBUG("Actor '%s'@%s is killing actor '%s'@%s", issuer->getCname(), issuer->host->getCname(), process->getCname(), + process->host->getCname()); process->context->iwannadie = 1; process->blocked = 0; @@ -500,10 +488,10 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) { boost::dynamic_pointer_cast(process->waiting_synchro); if (exec != nullptr) { - if (exec->surf_exec) { - exec->surf_exec->cancel(); - exec->surf_exec->unref(); - exec->surf_exec = nullptr; + if (exec->surfAction_) { + exec->surfAction_->cancel(); + exec->surfAction_->unref(); + exec->surfAction_ = nullptr; } } else if (comm != nullptr) { process->comms.remove(process->waiting_synchro); @@ -552,8 +540,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->surf_exec) - exec->surf_exec->cancel(); + if (exec != nullptr && exec->surfAction_) + exec->surfAction_->cancel(); simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(process->waiting_synchro); @@ -590,29 +578,27 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const } -void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) { - SIMIX_process_killall(simcall->issuer, reset_pid); +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 */ -void SIMIX_process_killall(smx_actor_t issuer, int reset_pid) +void SIMIX_process_killall(smx_actor_t issuer) { for (auto const& kv : simix_global->process_list) if (kv.second != issuer) SIMIX_process_kill(kv.second, issuer); - - if (reset_pid > 0) - simix_process_maxpid = reset_pid; } -void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest) +void SIMIX_process_change_host(smx_actor_t actor, sg_host_t dest) { - xbt_assert((process != nullptr), "Invalid parameters"); - simgrid::xbt::intrusive_erase(process->host->extension()->process_list, *process); - process->host = dest; - dest->extension()->process_list.push_back(*process); + xbt_assert((actor != nullptr), "Invalid parameters"); + simgrid::xbt::intrusive_erase(actor->host->extension()->process_list, *actor); + actor->host = dest; + dest->extension()->process_list.push_back(*actor); } void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t process) @@ -665,14 +651,6 @@ const char* SIMIX_process_self_get_name() { return process->name.c_str(); } -smx_actor_t SIMIX_process_get_by_name(const char* name) -{ - for (auto const& kv : simix_global->process_list) - if (kv.second->name == name) - return kv.second; - return nullptr; -} - void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_actor_t process, double timeout) { if (process->finished) { @@ -694,7 +672,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::surf::Action::State::done); + sleep->surf_sleep->finish(simgrid::kernel::resource::Action::State::done); intrusive_ptr_release(sleep); return 0; }, @@ -744,11 +722,6 @@ void SIMIX_process_yield(smx_actor_t self) /* Ok, maestro returned control to us */ XBT_DEBUG("Control returned to me: '%s'", self->name.c_str()); - if (self->new_host) { - SIMIX_process_change_host(self, self->new_host); - self->new_host = nullptr; - } - if (self->context->iwannadie){ XBT_DEBUG("I wanna die!"); self->finished = true; @@ -778,18 +751,11 @@ void SIMIX_process_yield(smx_actor_t self) std::rethrow_exception(std::move(exception)); } - if(SMPI_switch_data_segment && self->segment_index != -1){ - SMPI_switch_data_segment(self->segment_index); + if (SMPI_switch_data_segment && not self->finished) { + SMPI_switch_data_segment(self->iface()); } } -/* callback: termination */ -void SIMIX_process_exception_terminate(xbt_ex_t * e) -{ - xbt_ex_display(e); - xbt_abort(); -} - /** @brief Returns the list of processes to run. */ const std::vector& simgrid::simix::process_get_runnable() { @@ -804,6 +770,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()); 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();