X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4775ee0f232bccc4978dfbfb8153b7593be7dd77..2807fde4fd1f59c230d69a934634c5dfb77905f2:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index ed75d52815..393256fc27 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,15 +1,16 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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 "mc/mc.h" -#include "smx_private.h" +#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" -#include "src/mc/mc_replay.h" +#include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/surf_interface.hpp" #include "xbt/ex.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -28,7 +29,7 @@ namespace simgrid { Host::~Host() { - /* Clean Simulator data */ + /* All processes should be gone when the host is turned off (by the end of the simulation). */ if (xbt_swag_size(process_list) != 0) { std::string msg = std::string("Shutting down host, but it's not empty:"); smx_actor_t process = nullptr; @@ -38,10 +39,10 @@ namespace simgrid { SIMIX_display_process_status(); 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); @@ -53,10 +54,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) @@ -81,7 +82,8 @@ 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->getCname(), issuer->cname()); + XBT_DEBUG("Killing %s@%s on behalf of %s which turned off that host.", process->getCname(), + process->host->getCname(), issuer->getCname()); } } } else { @@ -122,7 +124,7 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std:: 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() && watched_hosts.find(host->getCname()) == watched_hosts.end()) { @@ -137,10 +139,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) @@ -190,11 +192,6 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li simgrid::kernel::activity::ExecImplPtr exec = simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, nullptr)); - /* set surf's synchro */ - 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 */ bool is_a_vm = (nullptr != dynamic_cast(host_list[0])); for (int i = 1; i < host_nb; i++) { @@ -204,6 +201,9 @@ SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_li /* set surf's synchro */ if (not MC_is_active() && not MC_record_replay_is_active()) { + /* set surf's synchro */ + sg_host_t* host_list_cpy = new sg_host_t[host_nb]; + std::copy_n(host_list, host_nb, host_list_cpy); exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); exec->surf_exec->setData(exec.get()); if (timeout > 0) { @@ -216,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 = @@ -266,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: