X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a511865336e83ac3654632265ed00b8f0bf0eccc..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index d4684dd72f..e263ffab5b 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,165 +1,112 @@ -/* 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 "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/simix/SynchroExec.hpp" -#include "src/simix/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); -/** - * \brief Internal function to create a SIMIX host. - * \param name name of the host to create - */ -void SIMIX_host_create(sg_host_t host) // FIXME: braindead prototype. Take sg_host as parameter -{ - smx_host_priv_t smx_host = xbt_new0(s_smx_host_priv_t, 1); +namespace simgrid { + namespace simix { + simgrid::xbt::Extension Host::EXTENSION_ID; - /* Host structure */ - simgrid::simix::Process proc; - smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); + Host::Host() + { + if (!Host::EXTENSION_ID.valid()) + Host::EXTENSION_ID = s4u::Host::extension_create(); - /* Update global variables */ - sg_host_simix_set(host, smx_host); -} + simgrid::simix::ActorImpl act; + process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup)); + } -/** - * \brief Start the host if it is off - * - */ -void SIMIX_host_on(sg_host_t h) -{ - smx_host_priv_t host = sg_host_simix(h); - - xbt_assert((host != NULL), "Invalid parameters"); - - if (h->isOff()) { - simgrid::surf::HostImpl* surf_host = h->extension(); - surf_host->turnOn(); - - unsigned int cpt; - smx_process_arg_t arg; - xbt_dynar_foreach(host->boot_processes,cpt,arg) { - XBT_DEBUG("Booting Process %s(%s) right now", - arg->name.c_str(), arg->hostname); - if (simix_global->create_process_function) { - simix_global->create_process_function(arg->name.c_str(), - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->args, - arg->properties, - arg->auto_restart, - NULL); - } else { - simcall_process_create(arg->name.c_str(), - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->args, - arg->properties, - arg->auto_restart); + 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; + } + SIMIX_display_process_status(); + THROWF(arg_error, 0, "%s", msg); } + for (auto arg : auto_restart_processes) + delete arg; + auto_restart_processes.clear(); + for (auto arg : boot_processes) + delete arg; + boot_processes.clear(); + xbt_swag_free(process_list); } - } -} -/** - * \brief Stop the host if it is on - * - */ -void SIMIX_host_off(sg_host_t h, smx_process_t issuer) + /** 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 arg : boot_processes) { + 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); + } + } + +}} // namespaces + +/** @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 != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); if (h->isOn()) { - simgrid::surf::HostImpl* surf_host = h->extension(); - surf_host->turnOff(); + h->pimpl_cpu->turnOff(); /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { - smx_process_t process = NULL; + 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()); - } -} - -/** - * \brief Internal function to destroy a SIMIX host. - * - * \param h the host to destroy (a sg_host_t) - */ -void SIMIX_host_destroy(void *h) -{ - smx_host_priv_t host = (smx_host_priv_t) h; - - xbt_assert((host != NULL), "Invalid parameters"); - - /* Clean Simulator data */ - if (xbt_swag_size(host->process_list) != 0) { - char *msg = xbt_strdup("Shutting down host, but it's not empty:"); - char *tmp; - smx_process_t process = NULL; - - xbt_swag_foreach(process, host->process_list) { - tmp = bprintf("%s\n\t%s", msg, process->name.c_str()); - free(msg); - msg = tmp; - } - SIMIX_display_process_status(); - THROWF(arg_error, 0, "%s", msg); + XBT_INFO("Host %s is already off", h->cname()); } - xbt_dynar_free(&host->auto_restart_processes); - xbt_dynar_free(&host->boot_processes); - xbt_swag_free(host->process_list); - - /* Clean host structure */ - free(host); - return; } -sg_host_t SIMIX_host_self(void) +sg_host_t SIMIX_host_self() { - smx_process_t process = SIMIX_process_self(); - return (process == NULL) ? NULL : SIMIX_process_get_host(process); + smx_actor_t process = SIMIX_process_self(); + return (process == nullptr) ? nullptr : process->host; } -/* needs to be public and without simcall because it is called - by exceptions and logging events */ -const char* SIMIX_host_self_get_name(void) +/* needs to be public and without simcall for exceptions and logging events */ +const char* SIMIX_host_self_get_name() { sg_host_t host = SIMIX_host_self(); - if (host == NULL || SIMIX_process_self() == simix_global->maestro_process) + 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 = *(smx_process_arg_t*)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 @@ -167,85 +114,51 @@ void _SIMIX_host_free_process_arg(void *data) * 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, - xbt_main_func_t code, - void *data, - const char *hostname, - double kill_time, - int argc, char **argv, - 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, xbt_dict_t properties, int auto_restart) { - if (!sg_host_simix(host)->auto_restart_processes) { - sg_host_simix(host)->auto_restart_processes = xbt_dynar_new(sizeof(smx_process_arg_t),_SIMIX_host_free_process_arg); - } smx_process_arg_t arg = new simgrid::simix::ProcessArg(); arg->name = name; - arg->code = code; + arg->code = std::move(code); arg->data = data; - arg->hostname = hostname; + arg->host = host; arg->kill_time = kill_time; - arg->args.assign(argc, argv); 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,NULL); - 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()); } - xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg); + host->extension()->auto_restart_processes.push_back(arg); } -/** - * \brief Restart the list of processes that have been registered to the host - */ +/** @brief Restart the list of processes that have been registered to the host */ void SIMIX_host_autorestart(sg_host_t host) { - unsigned int cpt; - smx_process_arg_t arg; - xbt_dynar_t process_list = sg_host_simix(host)->auto_restart_processes; - if (!process_list) - return; - - xbt_dynar_foreach (process_list, cpt, arg) { - - XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname); - if (simix_global->create_process_function) { - simix_global->create_process_function(arg->name.c_str(), - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->args, - arg->properties, - arg->auto_restart, - NULL); - } else { - simcall_process_create(arg->name.c_str(), - (xbt_main_func_t) arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->args, - arg->properties, - arg->auto_restart); - } + 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()); + 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); } - xbt_dynar_reset(process_list); + process_list.clear(); } -smx_synchro_t simcall_HANDLER_execution_start(smx_simcall_t simcall, - const char* name, double flops_amount, double priority, double bound, unsigned long affinity_mask) { - return SIMIX_execution_start(simcall->issuer, name,flops_amount,priority,bound,affinity_mask); +smx_activity_t 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); } -smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name, - double flops_amount, double priority, double bound, unsigned long affinity_mask){ + +smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority, + double bound){ /* alloc structures and initialize */ - simgrid::simix::Exec *exec = new simgrid::simix::Exec(); - exec->name = xbt_strdup(name); - exec->state = SIMIX_RUNNING; - exec->host = issuer->host; + simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, issuer->host); /* set surf's action */ if (!MC_is_active() && !MC_record_replay_is_active()) { @@ -254,46 +167,31 @@ smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name, exec->surf_exec->setData(exec); exec->surf_exec->setPriority(priority); - if (bound != 0) + if (bound > 0) static_cast(exec->surf_exec)->setBound(bound); - - if (affinity_mask != 0) { - /* just a double check to confirm that this host is the host where this task is running. */ - xbt_assert(exec->host == issuer->host); - static_cast(exec->surf_exec) - ->setAffinity(issuer->host->pimpl_cpu, affinity_mask); - } } - XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name); + XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str()); return exec; } -smx_synchro_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){ - - sg_host_t *host_list_cpy = NULL; - int i; +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::simix::Exec *exec = new simgrid::simix::Exec(); - exec->name = xbt_strdup(name); - exec->state = SIMIX_RUNNING; - exec->host = nullptr; /* FIXME: do we need the list of hosts? */ + simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr); /* set surf's synchro */ - host_list_cpy = xbt_new0(sg_host_t, host_nb); - for (i = 0; i < host_nb; i++) + 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 */ - simgrid::surf::HostImpl *host = host_list[0]->extension(); - bool is_a_vm = (nullptr != dynamic_cast(host)); - for (i = 1; i < host_nb; i++) { - bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i]->extension())); + 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])); xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet)."); } @@ -301,52 +199,46 @@ smx_synchro_t SIMIX_execution_parallel_start(const char *name, 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); return exec; } -void SIMIX_execution_cancel(smx_synchro_t synchro) +void SIMIX_execution_cancel(smx_activity_t synchro) { XBT_DEBUG("Cancel synchro %p", synchro); - simgrid::simix::Exec *exec = static_cast(synchro); + simgrid::kernel::activity::Exec *exec = static_cast(synchro); if (exec->surf_exec) exec->surf_exec->cancel(); } -void SIMIX_execution_set_priority(smx_synchro_t synchro, double priority) +void SIMIX_execution_set_priority(smx_activity_t synchro, double priority) { - simgrid::simix::Exec *exec = static_cast(synchro); + simgrid::kernel::activity::Exec *exec = static_cast(synchro); if(exec->surf_exec) exec->surf_exec->setPriority(priority); } -void SIMIX_execution_set_bound(smx_synchro_t synchro, double bound) +void SIMIX_execution_set_bound(smx_activity_t synchro, double bound) { - simgrid::simix::Exec *exec = static_cast(synchro); + simgrid::kernel::activity::Exec *exec = static_cast(synchro); if(exec->surf_exec) static_cast(exec->surf_exec)->setBound(bound); } -void SIMIX_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask) +void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchro) { - simgrid::simix::Exec *exec = static_cast(synchro); - if(exec->surf_exec) { - /* just a double check to confirm that this host is the host where this task is running. */ - xbt_assert(exec->host == host); - static_cast(exec->surf_exec)->setAffinity(host->pimpl_cpu, mask); - } -} - -void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro) -{ - simgrid::simix::Exec *exec = static_cast(synchro); + simgrid::kernel::activity::Exec *exec = static_cast(synchro); XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state); /* Associate this simcall to the synchro */ - xbt_fifo_push(synchro->simcalls, simcall); + synchro->simcalls.push_back(simcall); simcall->issuer->waiting_synchro = synchro; /* set surf's synchro */ @@ -361,13 +253,9 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro SIMIX_execution_finish(exec); } -void SIMIX_execution_finish(simgrid::simix::Exec *exec) +void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) { - xbt_fifo_item_t item; - smx_simcall_t simcall; - - xbt_fifo_foreach(exec->simcalls, item, simcall, smx_simcall_t) { - + for (smx_simcall_t simcall : exec->simcalls) { switch (exec->state) { case SIMIX_DONE: @@ -376,7 +264,7 @@ void SIMIX_execution_finish(simgrid::simix::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; @@ -386,6 +274,11 @@ void SIMIX_execution_finish(simgrid::simix::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); @@ -394,7 +287,7 @@ void SIMIX_execution_finish(simgrid::simix::Exec *exec) if (simcall->issuer->host->isOff()) simcall->issuer->context->iwannadie = 1; - simcall->issuer->waiting_synchro = NULL; + simcall->issuer->waiting_synchro = nullptr; simcall_execution_wait__set__result(simcall, exec->state); SIMIX_simcall_answer(simcall); } @@ -403,19 +296,19 @@ void SIMIX_execution_finish(simgrid::simix::Exec *exec) exec->unref(); } -void SIMIX_set_category(smx_synchro_t synchro, const char *category) +void SIMIX_set_category(smx_activity_t synchro, const char *category) { - if (synchro->state != SIMIX_RUNNING) return; + if (synchro->state != SIMIX_RUNNING) + return; - simgrid::simix::Exec *exec = dynamic_cast(synchro); + simgrid::kernel::activity::Exec *exec = dynamic_cast(synchro); if (exec != nullptr) { exec->surf_exec->setCategory(category); return; } - simgrid::simix::Comm *comm = dynamic_cast(synchro); + simgrid::kernel::activity::Comm *comm = dynamic_cast(synchro); if (comm != nullptr) { comm->surf_comm->setCategory(category); - return; } }