X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..3ba5d4a966c2ac976b2b1656c52145f70189d108:/src/simix/smx_host.cpp diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index 69043697a9..751916292b 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -1,19 +1,14 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2016. 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 "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/HostImpl.hpp" -#include "xbt/sysdep.h" -#include - -#include "src/kernel/activity/SynchroExec.hpp" -#include "src/kernel/activity/SynchroComm.hpp" +#include "xbt/ex.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -23,7 +18,7 @@ namespace simgrid { Host::Host() { - if (!Host::EXTENSION_ID.valid()) + if (not Host::EXTENSION_ID.valid()) Host::EXTENSION_ID = s4u::Host::extension_create(); simgrid::simix::ActorImpl act; @@ -62,15 +57,13 @@ namespace simgrid { void Host::turnOn() { for (auto arg : boot_processes) { - XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->name().c_str()); - simix_global->create_process_function(arg->name.c_str(), - arg->code, - nullptr, - arg->host, - arg->kill_time, - arg->properties, - arg->auto_restart, - nullptr); + XBT_DEBUG("Booting Process %s(%s) right now", arg->name.c_str(), arg->host->cname()); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, + arg->properties, 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); } } @@ -79,7 +72,7 @@ namespace simgrid { /** @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); + simgrid::simix::Host* host = h->extension(); xbt_assert((host != nullptr), "Invalid parameters"); @@ -115,11 +108,6 @@ const char* SIMIX_host_self_get_name() return host->cname(); } -void _SIMIX_host_free_process_arg(void *data) -{ - 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 * This function add a process to the list of the processes that will be restarted when the host comes @@ -140,24 +128,26 @@ void SIMIX_host_add_auto_restart_process( arg->properties = properties; arg->auto_restart = auto_restart; - if (host->isOff() && !xbt_dict_get_or_null(watched_hosts_lib, host->cname())) { + 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()); } - sg_host_simix(host)->auto_restart_processes.push_back(arg); + host->extension()->auto_restart_processes.push_back(arg); } /** @brief Restart the list of processes that have been registered to the host */ void SIMIX_host_autorestart(sg_host_t host) { - std::vector process_list = sg_host_simix(host)->auto_restart_processes; - if (process_list.empty()) - return; + 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()); - simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, arg->kill_time, - arg->properties, arg->auto_restart, nullptr); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, + arg->properties, 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); } process_list.clear(); } @@ -171,20 +161,21 @@ smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name, doubl double bound){ /* alloc structures and initialize */ - simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, issuer->host); + simgrid::kernel::activity::ExecImplPtr exec = + simgrid::kernel::activity::ExecImplPtr(new simgrid::kernel::activity::ExecImpl(name, issuer->host)); /* set surf's action */ - if (!MC_is_active() && !MC_record_replay_is_active()) { + if (not MC_is_active() && not MC_record_replay_is_active()) { exec->surf_exec = issuer->host->pimpl_cpu->execution_start(flops_amount); - exec->surf_exec->setData(exec); + exec->surf_exec->setData(exec.get()); exec->surf_exec->setPriority(priority); if (bound > 0) static_cast(exec->surf_exec)->setBound(bound); } - XBT_DEBUG("Create execute synchro %p: %s", exec, exec->name.c_str()); + XBT_DEBUG("Create execute synchro %p: %s", exec.get(), exec->name.c_str()); return exec; } @@ -194,7 +185,8 @@ smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_ { /* alloc structures and initialize */ - simgrid::kernel::activity::Exec *exec = new simgrid::kernel::activity::Exec(name, nullptr); + 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); @@ -209,23 +201,24 @@ smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_ } /* set surf's synchro */ - if (!MC_is_active() && !MC_record_replay_is_active()) { + if (not MC_is_active() && not MC_record_replay_is_active()) { exec->surf_exec = surf_host_model->executeParallelTask(host_nb, host_list_cpy, flops_amount, bytes_amount, rate); - exec->surf_exec->setData(exec); + exec->surf_exec->setData(exec.get()); if (timeout > 0) { exec->timeoutDetector = host_list[0]->pimpl_cpu->sleep(timeout); - exec->timeoutDetector->setData(exec); + exec->timeoutDetector->setData(exec.get()); } } - XBT_DEBUG("Create parallel execute synchro %p", exec); + XBT_DEBUG("Create parallel execute synchro %p", exec.get()); return exec; } void SIMIX_execution_cancel(smx_activity_t synchro) { - XBT_DEBUG("Cancel synchro %p", synchro); - simgrid::kernel::activity::Exec *exec = static_cast(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(); @@ -233,22 +226,25 @@ void SIMIX_execution_cancel(smx_activity_t synchro) void SIMIX_execution_set_priority(smx_activity_t synchro, double priority) { - simgrid::kernel::activity::Exec *exec = static_cast(synchro); + 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::Exec *exec = static_cast(synchro); + 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::Exec *exec = static_cast(synchro); - XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state); + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(synchro); + XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro.get(), (int)synchro->state); /* Associate this simcall to the synchro */ synchro->simcalls.push_back(simcall); @@ -266,7 +262,7 @@ void simcall_HANDLER_execution_wait(smx_simcall_t simcall, smx_activity_t synchr SIMIX_execution_finish(exec); } -void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) +void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec) { for (smx_simcall_t simcall : exec->simcalls) { switch (exec->state) { @@ -304,9 +300,6 @@ void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec) simcall_execution_wait__set__result(simcall, exec->state); SIMIX_simcall_answer(simcall); } - - /* We no longer need it */ - exec->unref(); } void SIMIX_set_category(smx_activity_t synchro, const char *category) @@ -314,15 +307,16 @@ void SIMIX_set_category(smx_activity_t synchro, const char *category) if (synchro->state != SIMIX_RUNNING) return; - simgrid::kernel::activity::Exec *exec = dynamic_cast(synchro); + simgrid::kernel::activity::ExecImplPtr exec = + boost::dynamic_pointer_cast(synchro); if (exec != nullptr) { exec->surf_exec->setCategory(category); return; } - simgrid::kernel::activity::Comm *comm = dynamic_cast(synchro); + simgrid::kernel::activity::CommImplPtr comm = + boost::dynamic_pointer_cast(synchro); if (comm != nullptr) { comm->surf_comm->setCategory(category); - return; } }