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);
" - 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;
}
THROWF(arg_error, 0, "%s", msg.c_str());
}
for (auto const& arg : actors_at_boot_)
- delete arg.second;
+ delete arg;
actors_at_boot_.clear();
}
*/
void HostImpl::turn_on()
{
- for (auto const& elm : actors_at_boot_) {
- kernel::actor::ProcessArg* arg = elm.second;
+ 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)
}
// When a host is turned off, we want to keep only the actors that should restart for when it will boot again.
// Then get rid of the others.
- auto elm = actors_at_boot_.begin();
- while (elm != actors_at_boot_.end()) {
- if (not elm->second->auto_restart) {
- delete elm->second;
- actors_at_boot_.erase(elm);
- } else
- ++elm;
- }
+ auto elm = remove_if(begin(actors_at_boot_), end(actors_at_boot_), [](kernel::actor::ProcessArg* arg) {
+ if (arg->auto_restart)
+ return false;
+ delete arg;
+ return true;
+ });
+ actors_at_boot_.erase(elm, end(actors_at_boot_));
}
std::vector<s4u::ActorPtr> HostImpl::get_all_actors()