X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/049a664e2a9c8e702a7ce52c86f7c590d11ad642..7981fe568ccfcc3c517bd73ac146d2b59fa85ea2:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 69054e2849..1dea2c954b 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,14 +1,16 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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. */ #include "mc/mc.h" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" -#include "src/mc/mc_replay.h" +#include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/surf_interface.hpp" #include "xbt/ex.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -20,34 +22,25 @@ namespace simgrid { { if (not Host::EXTENSION_ID.valid()) Host::EXTENSION_ID = s4u::Host::extension_create(); - - simgrid::simix::ActorImpl act; - process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup)); } Host::~Host() { - /* Clean Simulator data */ - if (xbt_swag_size(process_list) != 0) { - char *msg = xbt_strdup("Shutting down host, but it's not empty:"); - char *tmp; - smx_actor_t process = nullptr; - - xbt_swag_foreach(process, process_list) { - tmp = bprintf("%s\n\t%s", msg, process->name.c_str()); - free(msg); - msg = tmp; - } + /* 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); + THROWF(arg_error, 0, "%s", msg.c_str()); } - for (auto arg : auto_restart_processes) + for (auto const& arg : auto_restart_processes) delete arg; auto_restart_processes.clear(); - for (auto arg : boot_processes) + for (auto const& arg : boot_processes) delete arg; boot_processes.clear(); - xbt_swag_free(process_list); } /** Re-starts all the actors that are marked as restartable. @@ -56,14 +49,14 @@ namespace simgrid { */ void Host::turnOn() { - for (auto arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname()); + 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, nullptr); + arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (arg->auto_restart) - simcall_process_auto_restart_set(actor, arg->auto_restart); + actor->auto_restart = arg->auto_restart; } } @@ -80,15 +73,15 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) h->pimpl_cpu->turnOff(); /* Clean Simulator data */ - if (xbt_swag_size(host->process_list) != 0) { - smx_actor_t process = nullptr; - xbt_swag_foreach(process, host->process_list) { - SIMIX_process_kill(process, issuer); - XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->cname(), issuer->cname()); + 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->cname()); + XBT_INFO("Host %s is already off", h->getCname()); } } @@ -105,7 +98,7 @@ const char* sg_host_self_get_name() if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) return ""; - return host->cname(); + return host->getCname(); } /** @@ -115,89 +108,73 @@ const char* sg_host_self_get_name() * 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, xbt_dict_t properties, int auto_restart) +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) { - smx_process_arg_t arg = new simgrid::simix::ProcessArg(); - arg->name = name; - arg->code = std::move(code); - arg->data = data; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = properties; - arg->auto_restart = auto_restart; - - if (host->isOff() && not xbt_dict_get_or_null(watched_hosts_lib, host->cname())) { - xbt_dict_set(watched_hosts_lib, host->cname(), host, nullptr); - XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF", host->cname()); + simgrid::simix::ProcessArg* arg = + new simgrid::simix::ProcessArg(name, code, data, host, kill_time, nullptr, auto_restart); + arg->properties.reset(properties, [](decltype(properties)) {}); + + 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()); } + XBT_DEBUG("Adding Process %s to the auto-restart list of Host %s", arg->name.c_str(), arg->host->getCname()); host->extension()->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; - for (auto arg : process_list) { - XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->cname()); + for (auto const& arg : process_list) { + XBT_DEBUG("Restarting 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, nullptr); + arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (arg->auto_restart) - simcall_process_auto_restart_set(actor, arg->auto_restart); + actor->auto_restart = arg->auto_restart; } process_list.clear(); } -boost::intrusive_ptr simcall_HANDLER_execution_start(smx_simcall_t simcall, - const char* name, - double flops_amount, - double priority, double bound) -{ - return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound); -} - boost::intrusive_ptr -SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound) +SIMIX_execution_start(const char* name, 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, issuer->host)); + simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, host)); /* set surf's action */ if (not MC_is_active() && not MC_record_replay_is_active()) { - exec->surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount); - exec->surf_exec->setData(exec.get()); - exec->surf_exec->setPriority(priority); + exec->surfAction_ = host->pimpl_cpu->execution_start(flops_amount); + exec->surfAction_->setData(exec.get()); + exec->surfAction_->setSharingWeight(priority); if (bound > 0) - static_cast(exec->surf_exec)->setBound(bound); + static_cast(exec->surfAction_)->setBound(bound); } XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str()); + simgrid::kernel::activity::ExecImpl::onCreation(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 amount, double rate, double timeout) + 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)); - /* set surf's synchro */ - sg_host_t *host_list_cpy = xbt_new0(sg_host_t, host_nb); - for (int i = 0; i < host_nb; i++) - host_list_cpy[i] = host_list[i]; - /* 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++) { @@ -207,8 +184,11 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li /* set surf's synchro */ if (not MC_is_active() && not MC_record_replay_is_active()) { - exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - exec->surf_exec->setData(exec.get()); + /* 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()); if (timeout > 0) { exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); exec->timeoutDetector->setData(exec.get()); @@ -219,36 +199,8 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li return exec; } -void SIMIX_execution_cancel(smx_activity_t synchro) -{ - XBT_DEBUG("Cancel synchro %p", synchro.get()); - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(synchro); - - if (exec->surf_exec) - exec->surf_exec->cancel(); -} - -void SIMIX_execution_set_priority(smx_activity_t synchro, double priority) -{ - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(synchro); - if(exec->surf_exec) - exec->surf_exec->setPriority(priority); -} - -void SIMIX_execution_set_bound(smx_activity_t synchro, double bound) -{ - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(synchro); - if(exec->surf_exec) - static_cast(exec->surf_exec)->setBound(bound); -} - void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro) { - simgrid::kernel::activity::ExecImplPtr exec = - boost::static_pointer_cast(synchro); XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state); /* Associate this simcall to the synchro */ @@ -258,18 +210,37 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchr /* set surf's synchro */ if (MC_is_active() || MC_record_replay_is_active()) { synchro->state = SIMIX_DONE; - SIMIX_execution_finish(exec); + SIMIX_execution_finish(synchro); return; } /* If the synchro is already finished then perform the error handling */ if (synchro->state != SIMIX_RUNNING) - SIMIX_execution_finish(exec); + SIMIX_execution_finish(synchro); } -void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) +void simcall_HANDLER_execution_test(smx_simcall_t simcall, smx_activity_t synchro) { - for (smx_simcall_t simcall : exec->simcalls) { + 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); + 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); +} + +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) { case SIMIX_DONE: @@ -278,7 +249,7 @@ void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->cname()); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->getCname()); simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; @@ -315,13 +286,13 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category) simgrid::kernel::activity::ExecImplPtr exec = boost::dynamic_pointer_cast(synchro); if (exec != nullptr) { - exec->surf_exec->setCategory(category); + exec->surfAction_->setCategory(category); return; } simgrid::kernel::activity::CommImplPtr comm = boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { - comm->surf_comm->setCategory(category); + comm->surfAction_->setCategory(category); } }