X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa3d11f5b1b16193d2c0bbd389d22fd303349e0f..b51da37243dc16575499f4cb7729fe8bdd7fa514:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index d1d5ddb768..4449d497cc 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -5,6 +5,7 @@ * 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" @@ -34,7 +35,7 @@ void SIMIX_host_on(sg_host_t h) { smx_host_priv_t host = sg_host_simix(h); - xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); if (h->isOff()) { simgrid::surf::HostImpl* surf_host = h->extension(); @@ -48,16 +49,16 @@ void SIMIX_host_on(sg_host_t h) if (simix_global->create_process_function) { simix_global->create_process_function(arg->name.c_str(), arg->code, - NULL, + nullptr, arg->hostname, arg->kill_time, arg->properties, arg->auto_restart, - NULL); + nullptr); } else { simcall_process_create(arg->name.c_str(), arg->code, - NULL, + nullptr, arg->hostname, arg->kill_time, arg->properties, @@ -72,7 +73,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_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(); @@ -80,7 +81,7 @@ 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_process_t process = nullptr; xbt_swag_foreach(process, host->process_list) { SIMIX_process_kill(process, issuer); XBT_DEBUG("Killing %s on %s by %s", @@ -102,13 +103,13 @@ void SIMIX_host_destroy(void *h) { smx_host_priv_t host = (smx_host_priv_t) h; - xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "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; + smx_process_t process = nullptr; xbt_swag_foreach(process, host->process_list) { tmp = bprintf("%s\n\t%s", msg, process->name.c_str()); @@ -130,14 +131,14 @@ void SIMIX_host_destroy(void *h) sg_host_t SIMIX_host_self(void) { smx_process_t process = SIMIX_process_self(); - return (process == NULL) ? NULL : SIMIX_process_get_host(process); + return (process == nullptr) ? nullptr : SIMIX_process_get_host(process); } /* needs to be public and without simcall for exceptions and logging events */ const char* SIMIX_host_self_get_name(void) { 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); @@ -173,7 +174,7 @@ void SIMIX_host_add_auto_restart_process( 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); @@ -193,16 +194,16 @@ void SIMIX_host_autorestart(sg_host_t host) if (simix_global->create_process_function) { simix_global->create_process_function(arg->name.c_str(), arg->code, - NULL, + nullptr, arg->hostname, arg->kill_time, arg->properties, arg->auto_restart, - NULL); + nullptr); } else { simcall_process_create(arg->name.c_str(), arg->code, - NULL, + nullptr, arg->hostname, arg->kill_time, arg->properties, @@ -240,7 +241,7 @@ smx_synchro_t SIMIX_execution_start(smx_process_t issuer, const char *name, } } - XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name); + XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str()); return exec; } @@ -250,7 +251,7 @@ smx_synchro_t SIMIX_execution_parallel_start(const char *name, double *flops_amount, double *bytes_amount, double amount, double rate){ - sg_host_t *host_list_cpy = NULL; + sg_host_t *host_list_cpy = nullptr; int i; /* alloc structures and initialize */ @@ -318,7 +319,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t 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 */ @@ -335,11 +336,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_synchro_t synchro void SIMIX_execution_finish(simgrid::simix::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: @@ -366,7 +363,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); }