X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9bfc714f74d8044a224b5c94ad3f69e540361841..6126924e83eded994bef252b90becedc31015a59:/src/surf/HostImpl.cpp diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index f718d80ada..32e7c03c44 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -57,7 +57,7 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h double* bytes_amount, double rate) { kernel::resource::Action* action = nullptr; - if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) { + if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) { action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]); } else if ((host_nb == 1) && (has_cost(flops_amount, 0) <= 0)) { action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate); @@ -87,9 +87,6 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h " - Self-comms with one host only\n" " - Communications with two hosts and no computation"); } - delete[] host_list; - delete[] flops_amount; - delete[] bytes_amount; return action; } @@ -127,8 +124,8 @@ void HostImpl::turn_on() { for (auto const& arg : actors_at_boot_) { XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname()); - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), arg->code, nullptr, arg->host, - arg->properties.get(), nullptr); + smx_actor_t actor = + SIMIX_process_create(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (arg->auto_restart)