X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c4bef6efee6ba4a06f99e78ea1198d74dc520fc..b8996c34869f8fbd6edf7556d7bef921e55962ba:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index bc6c5a7877..017c339041 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -8,6 +8,7 @@ #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/surf_interface.hpp" #include "xbt/ex.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -29,22 +30,18 @@ namespace simgrid { { /* Clean Simulator data */ if (xbt_swag_size(process_list) != 0) { - char *msg = xbt_strdup("Shutting down host, but it's not empty:"); - char *tmp; + std::string msg = std::string("Shutting down host, but it's not empty:"); 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; - } + xbt_swag_foreach(process, process_list) msg = msg + "\n\t" + process->name.c_str(); + 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); @@ -56,10 +53,10 @@ namespace simgrid { */ void Host::turnOn() { - for (auto arg : boot_processes) { + 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) @@ -115,9 +112,9 @@ 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; @@ -125,12 +122,12 @@ void SIMIX_host_add_auto_restart_process( arg->data = data; arg->host = host; arg->kill_time = kill_time; - arg->properties = properties; + arg->properties.reset(properties, [](decltype(properties)) {}); arg->auto_restart = auto_restart; - if (host->isOff() && not xbt_dict_get_or_null(watched_hosts_lib, host->getCname())) { - xbt_dict_set(watched_hosts_lib, host->getCname(), host, nullptr); - XBT_DEBUG("Push host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF", host->getCname()); + 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()); } host->extension()->auto_restart_processes.push_back(arg); } @@ -140,10 +137,10 @@ void SIMIX_host_autorestart(sg_host_t host) std::vector process_list = host->extension()->auto_restart_processes; - for (auto arg : process_list) { + 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) @@ -186,7 +183,7 @@ SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, 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 */ @@ -219,32 +216,6 @@ 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->setSharingWeight(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 = @@ -269,7 +240,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchr void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) { - for (smx_simcall_t simcall : exec->simcalls) { + for (smx_simcall_t const& simcall : exec->simcalls) { switch (exec->state) { case SIMIX_DONE: