X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef..13cfb5c4733854671750256e92a6aca384d25626:/src/simix/smx_host.cpp?ds=sidebyside diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index e263ffab5b..5605745391 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -5,11 +5,10 @@ #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 - -#include "src/kernel/activity/SynchroComm.hpp" +#include "xbt/ex.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); @@ -19,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; @@ -60,9 +59,11 @@ namespace simgrid { for (auto arg : boot_processes) { 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, arg->auto_restart, nullptr); + 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); } } @@ -127,7 +128,7 @@ 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()); } @@ -142,9 +143,11 @@ void SIMIX_host_autorestart(sg_host_t host) for (auto arg : process_list) { XBT_DEBUG("Restarting 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, arg->auto_restart, nullptr); + 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(); } @@ -158,13 +161,14 @@ 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) @@ -181,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); @@ -196,12 +201,12 @@ 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); @@ -212,7 +217,8 @@ smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_ void SIMIX_execution_cancel(smx_activity_t synchro) { XBT_DEBUG("Cancel synchro %p", synchro); - 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->cancel(); @@ -220,21 +226,24 @@ 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); + simgrid::kernel::activity::ExecImplPtr exec = + boost::static_pointer_cast(synchro); XBT_DEBUG("Wait for execution of synchro %p, state %d", synchro, (int)synchro->state); /* Associate this simcall to the synchro */ @@ -253,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) { @@ -291,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) @@ -301,13 +307,15 @@ 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); }