X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38f7ddbf61f574a934f191ef2d8358d9f8be1f96..b8996c34869f8fbd6edf7556d7bef921e55962ba:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 751916292b..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,14 +53,14 @@ namespace simgrid { */ void Host::turnOn() { - for (auto arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname()); + 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) - simcall_process_auto_restart_set(actor, arg->auto_restart); + actor->auto_restart = arg->auto_restart; } } @@ -84,28 +81,28 @@ 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@%s on behalf of %s", process->cname(), process->host->cname(), issuer->cname()); + XBT_DEBUG("Killing %s@%s on behalf of %s", process->cname(), process->host->getCname(), issuer->cname()); } } } else { - XBT_INFO("Host %s is already off", h->cname()); + XBT_INFO("Host %s is already off", h->getCname()); } } -sg_host_t SIMIX_host_self() +sg_host_t sg_host_self() { smx_actor_t process = SIMIX_process_self(); return (process == nullptr) ? nullptr : process->host; } /* needs to be public and without simcall for exceptions and logging events */ -const char* SIMIX_host_self_get_name() +const char* sg_host_self_get_name() { - sg_host_t host = SIMIX_host_self(); + sg_host_t host = sg_host_self(); if (host == nullptr || SIMIX_process_self() == simix_global->maestro_process) return ""; - return host->cname(); + return host->getCname(); } /** @@ -115,9 +112,9 @@ const char* SIMIX_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->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()); + 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,25 +137,29 @@ void SIMIX_host_autorestart(sg_host_t host) 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()); + 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) - simcall_process_auto_restart_set(actor, arg->auto_restart); + actor->auto_restart = arg->auto_restart; } process_list.clear(); } -smx_activity_t simcall_HANDLER_execution_start(smx_simcall_t simcall, const char* name, double flops_amount, - double priority, double bound) { +boost::intrusive_ptr 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_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, double flops_amount, double priority, - double bound){ +boost::intrusive_ptr +SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound) +{ /* alloc structures and initialize */ simgrid::kernel::activity::ExecImplPtr exec = @@ -169,7 +170,7 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl exec->surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount); exec->surf_exec->setData(exec.get()); - exec->surf_exec->setPriority(priority); + exec->surf_exec->setSharingWeight(priority); if (bound > 0) static_cast(exec->surf_exec)->setBound(bound); @@ -180,8 +181,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, double timeout) +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 rate, double timeout) { /* alloc structures and initialize */ @@ -214,32 +216,6 @@ smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_ 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->setPriority(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 = @@ -264,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: @@ -273,7 +249,7 @@ void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) break; case SIMIX_FAILED: - XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->cname()); + XBT_DEBUG("SIMIX_execution_finished: host '%s' failed", simcall->issuer->host->getCname()); simcall->issuer->context->iwannadie = 1; SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed"); break;