X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af459dff2b5461c2dbc61e5b5cbdc302f92d2404..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index da84fe54ba..05dc306c6f 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.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. */ @@ -6,91 +6,14 @@ #include "mc/mc.h" #include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/surf_interface.hpp" +#include "src/simix/smx_host_private.hpp" #include "xbt/ex.hpp" -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); -namespace simgrid { - namespace simix { - simgrid::xbt::Extension Host::EXTENSION_ID; - - Host::Host() - { - if (not Host::EXTENSION_ID.valid()) - Host::EXTENSION_ID = s4u::Host::extension_create(); - } - - Host::~Host() - { - /* All processes should be gone when the host is turned off (by the end of the simulation). */ - if (not process_list.empty()) { - std::string msg = std::string("Shutting down host, but it's not empty:"); - for (auto const& process : process_list) - msg += "\n\t" + std::string(process.getName()); - - SIMIX_display_process_status(); - THROWF(arg_error, 0, "%s", msg.c_str()); - } - for (auto const& arg : auto_restart_processes) - delete arg; - auto_restart_processes.clear(); - for (auto const& arg : boot_processes) - delete arg; - boot_processes.clear(); - } - - /** Re-starts all the actors that are marked as restartable. - * - * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this. - */ - void Host::turnOn() - { - for (auto const& arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->getCname()); - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, - arg->properties.get(), nullptr); - if (arg->kill_time >= 0) - simcall_process_set_kill_time(actor, arg->kill_time); - if (arg->auto_restart) - actor->auto_restart = arg->auto_restart; - } - } - -}} // namespaces - -/** @brief Stop the host if it is on */ -void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) -{ - simgrid::simix::Host* host = h->extension(); - - xbt_assert((host != nullptr), "Invalid parameters"); - - if (h->isOn()) { - h->pimpl_cpu->turnOff(); - - /* Clean Simulator data */ - if (not host->process_list.empty()) { - for (auto& process : host->process_list) { - SIMIX_process_kill(&process, issuer); - XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process.getCname(), - process.host->getCname(), issuer->getCname()); - } - } - } else { - XBT_INFO("Host %s is already off", h->getCname()); - } -} - -sg_host_t sg_host_self() -{ - smx_actor_t process = SIMIX_process_self(); - return (process == nullptr) ? nullptr : process->host; -} - /* needs to be public and without simcall for exceptions and logging events */ const char* sg_host_self_get_name() { @@ -98,82 +21,73 @@ const char* sg_host_self_get_name() if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) return ""; - return host->getCname(); + return host->get_cname(); } /** - * \brief Add a process to the list of the processes that the host will restart when it comes back + * @brief Add a process to the list of the processes that the host will restart when it comes back * This function add a process to the list of the processes that will be restarted when the host comes * back. It is expected that this function is called when the host is down. * The processes will only be restarted once, meaning that you will have to register the process * again to restart the process again. */ -void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::function code, void* data, - double kill_time, std::map* properties, - int auto_restart) +void SIMIX_host_add_auto_restart_process(sg_host_t host, simgrid::kernel::actor::ActorImpl* actor) { - simgrid::simix::ProcessArg* arg = - new simgrid::simix::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart); - arg->properties.reset(properties, [](decltype(properties)) {}); + simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(host, actor); - if (host->isOff() && watched_hosts.find(host->getCname()) == watched_hosts.end()) { - watched_hosts.insert(host->getCname()); - XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->getCname()); + if (host->is_off() && watched_hosts.find(host->get_cname()) == watched_hosts.end()) { + watched_hosts.insert(host->get_cname()); + XBT_DEBUG("Push host %s to watched_hosts because state == SURF_RESOURCE_OFF", host->get_cname()); } - host->extension()->auto_restart_processes.push_back(arg); + XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->get_cname()); + host->pimpl_->auto_restart_processes_.push_back(arg); } /** @brief Restart the list of processes that have been registered to the host */ void SIMIX_host_autorestart(sg_host_t host) { - std::vector process_list = - host->extension()->auto_restart_processes; + std::vector process_list = host->pimpl_->auto_restart_processes_; for (auto const& arg : process_list) { - XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->getCname()); + XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->get_cname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (arg->auto_restart) - actor->auto_restart = arg->auto_restart; + actor->auto_restart_ = arg->auto_restart; } process_list.clear(); } -boost::intrusive_ptr -SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host) +simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, std::string category, + double flops_amount, double priority, double bound, + sg_host_t host) { - /* alloc structures and initialize */ - simgrid::kernel::activity::ExecImplPtr exec = - simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, host)); - /* set surf's action */ + simgrid::kernel::resource::Action* surf_action = nullptr; if (not MC_is_active() && not MC_record_replay_is_active()) { - - exec->surfAction_ = host->pimpl_cpu->execution_start(flops_amount); - exec->surfAction_->setData(exec.get()); - exec->surfAction_->setSharingWeight(priority); - + surf_action = host->pimpl_cpu->execution_start(flops_amount); + surf_action->set_priority(priority); if (bound > 0) - static_cast(exec->surfAction_)->setBound(bound); + surf_action->set_bound(bound); } - XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str()); - simgrid::kernel::activity::ExecImpl::onCreation(exec); + simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr( + new simgrid::kernel::activity::ExecImpl(name, surf_action, /*timeout_detector*/ nullptr, host)); + + exec->set_category(category); + XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name_.c_str()); + simgrid::kernel::activity::ExecImpl::on_creation(exec); return exec; } -boost::intrusive_ptr -SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate, double timeout) +simgrid::kernel::activity::ExecImplPtr SIMIX_execution_parallel_start(std::string name, int host_nb, + sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double rate, double timeout) { - /* alloc structures and initialize */ - simgrid::kernel::activity::ExecImplPtr exec = - simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, nullptr)); - /* Check that we are not mixing VMs and PMs in the parallel task */ bool is_a_vm = (nullptr != dynamic_cast(host_list[0])); for (int i = 1; i < host_nb; i++) { @@ -182,17 +96,20 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li } /* set surf's synchro */ + simgrid::kernel::resource::Action* surf_action = nullptr; + simgrid::kernel::resource::Action* timeout_detector = nullptr; if (not MC_is_active() && not MC_record_replay_is_active()) { - /* set surf's synchro */ sg_host_t* host_list_cpy = new sg_host_t[host_nb]; std::copy_n(host_list, host_nb, host_list_cpy); - exec->surfAction_ = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - exec->surfAction_->setData(exec.get()); + surf_action = surf_host_model->execute_parallel(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); if (timeout > 0) { - exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); - exec->timeoutDetector->setData(exec.get()); + timeout_detector = host_list[0]->pimpl_cpu->sleep(timeout); } } + + simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr( + new simgrid::kernel::activity::ExecImpl(name, surf_action, timeout_detector, nullptr)); + XBT_DEBUG("Create parallel execute synchro %p", exec.get()); return exec; @@ -200,36 +117,34 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro) { - XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state); + XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state_); /* Associate this simcall to the synchro */ - synchro->simcalls.push_back(simcall); + synchro->simcalls_.push_back(simcall); simcall->issuer->waiting_synchro = synchro; /* set surf's synchro */ if (MC_is_active() || MC_record_replay_is_active()) { - synchro->state = SIMIX_DONE; + synchro->state_ = SIMIX_DONE; SIMIX_execution_finish(synchro); return; } /* If the synchro is already finished then perform the error handling */ - if (synchro->state != SIMIX_RUNNING) + if (synchro->state_ != SIMIX_RUNNING) SIMIX_execution_finish(synchro); } void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro) { - simcall_execution_test__set__result(simcall, (synchro->state != SIMIX_WAITING && synchro->state != SIMIX_RUNNING)); - if (simcall_execution_test__get__result(simcall)) { - synchro->simcalls.push_back(simcall); + int res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING); + if (res) { + synchro->simcalls_.push_back(simcall); SIMIX_execution_finish(synchro); } else { SIMIX_simcall_answer(simcall); } - /* If the synchro is already finished then perform the error handling */ - if (synchro->state != SIMIX_RUNNING) - SIMIX_execution_finish(synchro); + simcall_execution_test__set__result(simcall, res); } void SIMIX_execution_finish(smx_activity_t synchro) @@ -237,10 +152,10 @@ void SIMIX_execution_finish(smx_activity_t synchro) simgrid::kernel::activity::ExecImplPtr exec = boost::static_pointer_cast(synchro); - while (not synchro->simcalls.empty()) { - smx_simcall_t simcall = synchro->simcalls.front(); - synchro->simcalls.pop_front(); - switch (exec->state) { + while (not synchro->simcalls_.empty()) { + smx_simcall_t simcall = synchro->simcalls_.front(); + synchro->simcalls_.pop_front(); + switch (exec->state_) { case SIMIX_DONE: /* do nothing, synchro done */ @@ -248,8 +163,8 @@ void SIMIX_execution_finish(smx_activity_t synchro) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->getCname()); - simcall->issuer->context->iwannadie = 1; + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host_->get_cname()); + simcall->issuer->context_->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; @@ -264,34 +179,33 @@ void SIMIX_execution_finish(smx_activity_t synchro) break; default: - xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", - (int)exec->state); + xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", (int)exec->state_); } /* Fail the process if the host is down */ - if (simcall->issuer->host->isOff()) - simcall->issuer->context->iwannadie = 1; + if (simcall->issuer->host_->is_off()) + simcall->issuer->context_->iwannadie = 1; simcall->issuer->waiting_synchro = nullptr; - simcall_execution_wait__set__result(simcall, exec->state); + simcall_execution_wait__set__result(simcall, exec->state_); SIMIX_simcall_answer(simcall); } } -void SIMIX_set_category(smx_activity_t synchro, const char *category) +void SIMIX_set_category(smx_activity_t synchro, std::string category) { - if (synchro->state != SIMIX_RUNNING) + if (synchro->state_ != SIMIX_RUNNING) return; simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(synchro); if (exec != nullptr) { - exec->surfAction_->setCategory(category); + exec->surf_action_->set_category(category); return; } simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { - comm->surfAction_->setCategory(category); + comm->surfAction_->set_category(category); } }