X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d67901dba3dfd8e75f708c329b8144287490077..7b8301c7b24916c15434108eebc479e8e7603ece:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 800a511cc1..7eaf2bb054 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -5,93 +5,83 @@ * 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 "src/mc/mc_replay.h" #include "src/surf/virtual_machine.hpp" #include "src/surf/HostImpl.hpp" -#include "src/simix/SynchroExec.hpp" -#include "src/simix/SynchroComm.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); -static void SIMIX_execution_finish(smx_synchro_t synchro); +namespace simgrid { + namespace simix { + simgrid::xbt::Extension Host::EXTENSION_ID; -/** - * \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); - s_smx_process_t proc; - - /* Host structure */ - smx_host->process_list = xbt_swag_new(xbt_swag_offset(proc, host_proc_hookup)); - - /* Update global variables */ - sg_host_simix_set(host, smx_host); -} + Host::Host() + { + if (!EXTENSION_ID.valid()) + EXTENSION_ID = simgrid::s4u::Host::extension_create(); -/** - * \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); + simgrid::simix::ActorImpl act; + process_list = xbt_swag_new(xbt_swag_offset(act, host_proc_hookup)); + } - xbt_assert((host != NULL), "Invalid parameters"); + 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(); + xbt_dynar_free(&boot_processes); + xbt_swag_free(process_list); + } - 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) { - - char** argv = xbt_new(char*, arg->argc); - for (int i=0; iargc; i++) - argv[i] = xbt_strdup(arg->argv[i]); - - XBT_DEBUG("Booting Process %s(%s) right now", arg->argv[0], arg->hostname); - if (simix_global->create_process_function) { - simix_global->create_process_function(argv[0], - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->argc, - argv, - arg->properties, - arg->auto_restart, - NULL); - } else { - simcall_process_create(arg->argv[0], - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->argc, - argv, - arg->properties, - arg->auto_restart); + /** 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() + { + unsigned int cpt; + smx_process_arg_t arg; + xbt_dynar_foreach(boot_processes,cpt,arg) { + XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->hostname); + simix_global->create_process_function(arg->name.c_str(), + arg->code, + nullptr, + arg->hostname, + arg->kill_time, + arg->properties, + arg->auto_restart, + nullptr); } } - } -} -/** - * \brief Stop the host if it is on - * - */ -void SIMIX_host_off(sg_host_t h, smx_process_t issuer) +}} // 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); - xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); if (h->isOn()) { simgrid::surf::HostImpl* surf_host = h->extension(); @@ -99,63 +89,30 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer) /* 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, sg_host_get_name(process->host), issuer->name); + XBT_DEBUG("Killing %s on %s by %s", + process->name.c_str(), sg_host_get_name(process->host), + issuer->name.c_str()); } } } 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); - free(msg); - msg = tmp; - } - SIMIX_display_process_status(); - THROWF(arg_error, 0, "%s", msg); + XBT_INFO("Host %s is already off", h->name().c_str()); } - 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); @@ -163,12 +120,8 @@ const char* SIMIX_host_self_get_name(void) void _SIMIX_host_free_process_arg(void *data) { - smx_process_arg_t arg = *(smx_process_arg_t*)data; - for (int i = 0; i < arg->argc; i++) - xbt_free(arg->argv[i]); - xbt_free(arg->argv); - xbt_free(arg->name); - xbt_free(arg); + 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 @@ -177,100 +130,52 @@ 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, const char *hostname, 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 = xbt_new(s_smx_process_arg_t,1); - arg->name = xbt_strdup(name); - arg->code = code; + smx_process_arg_t arg = new simgrid::simix::ProcessArg(); + arg->name = name; + arg->code = std::move(code); arg->data = data; arg->hostname = hostname; arg->kill_time = kill_time; - arg->argc = argc; - - arg->argv = xbt_new(char*,argc + 1); - - for (int i = 0; i < argc; i++) - arg->argv[i] = xbt_strdup(argv[i]); - arg->argv[argc] = NULL; - 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_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)); } - xbt_dynar_push_as(sg_host_simix(host)->auto_restart_processes,smx_process_arg_t,arg); + sg_host_simix(host)->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) + std::vector process_list = sg_host_simix(host)->auto_restart_processes; + if (process_list.empty()) return; - xbt_dynar_foreach (process_list, cpt, arg) { - - XBT_DEBUG("Restarting Process %s(%s) right now", arg->argv[0], arg->hostname); - if (simix_global->create_process_function) { - simix_global->create_process_function(arg->argv[0], - arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->argc, - arg->argv, - arg->properties, - arg->auto_restart, - NULL); - } else { - simcall_process_create(arg->argv[0], - (xbt_main_func_t) arg->code, - NULL, - arg->hostname, - arg->kill_time, - arg->argc, - arg->argv, - arg->properties, - arg->auto_restart); + for (auto arg : process_list) { - } - /* arg->argv is used by the process created above. Hide it to - * _SIMIX_host_free_process_arg() which is called by xbt_dynar_reset() - * below. */ - arg->argc = 0; - arg->argv = NULL; + XBT_DEBUG("Restarting Process %s(%s) right now", arg->name.c_str(), arg->hostname); + simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->hostname, arg->kill_time, + arg->properties, arg->auto_restart, nullptr); } - 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()) { @@ -279,45 +184,30 @@ 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){ /* 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++) { + for (int i = 1; i < host_nb; i++) { bool tmp_is_a_vm = (nullptr != dynamic_cast(host_list[i]->extension())); xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet)."); } @@ -332,110 +222,54 @@ smx_synchro_t SIMIX_execution_parallel_start(const char *name, return exec; } -void SIMIX_execution_destroy(smx_synchro_t synchro) -{ - XBT_DEBUG("Destroy synchro %p", synchro); - simgrid::simix::Exec *exec = static_cast(synchro); - - if (exec->surf_exec) { - exec->surf_exec->unref(); - exec->surf_exec = NULL; - } - delete 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(); } -double SIMIX_execution_get_remains(smx_synchro_t synchro) +void SIMIX_execution_set_priority(smx_activity_t synchro, double priority) { - double result = 0.0; - simgrid::simix::Exec *exec = static_cast(synchro); - - if (synchro->state == SIMIX_RUNNING) - result = exec->surf_exec->getRemains(); - - return result; -} - -e_smx_state_t SIMIX_execution_get_state(smx_synchro_t synchro) -{ - return synchro->state; -} - -void SIMIX_execution_set_priority(smx_synchro_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) -{ - 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) +void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t 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 */ if (MC_is_active() || MC_record_replay_is_active()) { synchro->state = SIMIX_DONE; - SIMIX_execution_finish(synchro); + SIMIX_execution_finish(exec); return; } /* If the synchro is already finished then perform the error handling */ if (synchro->state != SIMIX_RUNNING) - SIMIX_execution_finish(synchro); -} - -void SIMIX_execution_suspend(smx_synchro_t synchro) -{ - simgrid::simix::Exec *exec = static_cast(synchro); - if(exec->surf_exec) - exec->surf_exec->suspend(); + SIMIX_execution_finish(exec); } -void SIMIX_execution_resume(smx_synchro_t synchro) +void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) { - simgrid::simix::Exec *exec = static_cast(synchro); - if(exec->surf_exec) - exec->surf_exec->resume(); -} - -void SIMIX_execution_finish(smx_synchro_t synchro) -{ - xbt_fifo_item_t item; - smx_simcall_t simcall; - - xbt_fifo_foreach(synchro->simcalls, item, simcall, smx_simcall_t) { - - switch (synchro->state) { + for (smx_simcall_t simcall : exec->simcalls) { + switch (exec->state) { case SIMIX_DONE: /* do nothing, synchro done */ @@ -455,62 +289,33 @@ void SIMIX_execution_finish(smx_synchro_t synchro) default: xbt_die("Internal error in SIMIX_execution_finish: unexpected synchro state %d", - (int)synchro->state); + (int)exec->state); } - /* check if the host is down */ - if (simcall->issuer->host->isOff()) { + /* Fail the process if the host is down */ + if (simcall->issuer->host->isOff()) simcall->issuer->context->iwannadie = 1; - } - simcall->issuer->waiting_synchro = NULL; - simcall_execution_wait__set__result(simcall, synchro->state); + simcall->issuer->waiting_synchro = nullptr; + simcall_execution_wait__set__result(simcall, exec->state); SIMIX_simcall_answer(simcall); } /* We no longer need it */ - SIMIX_execution_destroy(synchro); + exec->unref(); } - -void SIMIX_post_host_execute(smx_synchro_t synchro) +void SIMIX_set_category(smx_activity_t synchro, const char *category) { - simgrid::simix::Exec *exec = dynamic_cast(synchro); - - if (exec != nullptr && exec->host && /* FIMXE: handle resource failure for parallel tasks too */ - exec->host->isOff()) { - /* If the host running the synchro failed, notice it. This way, the asking - * process can be killed if it runs on that host itself */ - synchro->state = SIMIX_FAILED; - } else if (exec->surf_exec->getState() == simgrid::surf::Action::State::failed) { - /* If the host running the synchro didn't fail, then the synchro was canceled */ - synchro->state = SIMIX_CANCELED; - } else { - synchro->state = SIMIX_DONE; - } - - if (exec != nullptr && exec->surf_exec) { - exec->surf_exec->unref(); - exec->surf_exec = NULL; - } - - /* If there are simcalls associated with the synchro, then answer them */ - if (xbt_fifo_size(synchro->simcalls)) { - SIMIX_execution_finish(synchro); - } -} - - -void SIMIX_set_category(smx_synchro_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;