X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2075838c45a56f2710e5e62ef3ceb7c67add6a31..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 0f0878ad24..e263ffab5b 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,18 +1,14 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2016. 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 "smx_private.h" -#include -#include "xbt/sysdep.h" #include "mc/mc.h" +#include "smx_private.h" #include "src/mc/mc_replay.h" -#include "src/surf/virtual_machine.hpp" -#include "src/surf/HostImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include -#include "src/kernel/activity/SynchroExec.hpp" #include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -62,15 +58,11 @@ namespace simgrid { void Host::turnOn() { for (auto arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->name().c_str()); - simix_global->create_process_function(arg->name.c_str(), - arg->code, - nullptr, - arg->host, - arg->kill_time, - arg->properties, - arg->auto_restart, - nullptr); + XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname()); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, + arg->properties, arg->auto_restart, nullptr); + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); } } @@ -79,7 +71,7 @@ namespace simgrid { /** @brief Stop the host if it is on */ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) { - smx_host_priv_t host = sg_host_simix(h); + simgrid::simix::Host* host = h->extension(); xbt_assert((host != nullptr), "Invalid parameters"); @@ -91,13 +83,11 @@ void SIMIX_host_off(sg_host_t h, smx_actor_t issuer) smx_actor_t process = nullptr; xbt_swag_foreach(process, host->process_list) { SIMIX_process_kill(process, issuer); - XBT_DEBUG("Killing %s on %s by %s", - process->name.c_str(), sg_host_get_name(process->host), - issuer->name.c_str()); + XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->cname(), issuer->cname()); } } } else { - XBT_INFO("Host %s is already off", h->name().c_str()); + XBT_INFO("Host %s is already off", h->cname()); } } @@ -114,14 +104,9 @@ const char* SIMIX_host_self_get_name() if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) return ""; - return sg_host_get_name(host); + return host->cname(); } -void _SIMIX_host_free_process_arg(void *data) -{ - smx_process_arg_t arg = *(static_cast(data)); - delete arg; -} /** * \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 @@ -142,24 +127,24 @@ void SIMIX_host_add_auto_restart_process( arg->properties = properties; arg->auto_restart = auto_restart; - if( host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){ - xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,nullptr); - XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host)); + if (host->isOff() && !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()); } - sg_host_simix(host)->auto_restart_processes.push_back(arg); + 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 = sg_host_simix(host)->auto_restart_processes; - if (process_list.empty()) - return; + 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->name().c_str()); - simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time, - arg->properties, arg->auto_restart, nullptr); + XBT_DEBUG("Restarting Process %s@%s right now", arg->name.c_str(), arg->host->cname()); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, + arg->properties, arg->auto_restart, nullptr); + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); } process_list.clear(); } @@ -191,8 +176,9 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl return exec; } -smx_activity_t 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){ +smx_activity_t 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) +{ /* alloc structures and initialize */ simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr); @@ -203,9 +189,9 @@ smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_ 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]->pimpl_)); + bool is_a_vm = (nullptr != dynamic_cast(host_list[0])); for (int i = 1; i < host_nb; i++) { - bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i]->pimpl_)); + bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i])); xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet)."); } @@ -213,6 +199,10 @@ smx_activity_t SIMIX_execution_parallel_start(const char *name, int host_nb, sg_ if (!MC_is_active() && !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); + if (timeout > 0) { + exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); + exec->timeoutDetector->setData(exec); + } } XBT_DEBUG("Create parallel execute synchro %p", exec); @@ -274,7 +264,7 @@ void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", sg_host_get_name(simcall->issuer->host)); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->cname()); simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break; @@ -284,6 +274,11 @@ void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) SMX_EXCEPTION(simcall->issuer, cancel_error, 0, "Canceled"); break; + case SIMIX_TIMEOUT: + XBT_DEBUG("SIMIX_execution_finished: execution timeouted"); + SMX_EXCEPTION(simcall->issuer, timeout_error, 0, "Timeouted"); + break; + default: xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", (int)exec->state); @@ -315,6 +310,5 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category) simgrid::kernel::activity::Comm *comm = dynamic_cast(synchro); if (comm != nullptr) { comm->surf_comm->setCategory(category); - return; } }