Several actors may use the same name (e.g. app-masterworker-multicore).
Also fixes a memory leak.
simgrid::simix::simcall([this, autorestart]() {
pimpl_->set_auto_restart(autorestart);
- std::map<std::string, kernel::actor::ProcessArg*>* actors_map = &pimpl_->host_->pimpl_->actors_at_boot_;
- if (actors_map->find(pimpl_->name_) == actors_map->end()) {
- simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->host_, pimpl_);
- XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
- actors_map->insert({arg->name, arg});
- }
+ simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->host_, pimpl_);
+ XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
+ pimpl_->host_->pimpl_->actors_at_boot_.emplace_back(arg);
});
}
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);
}
// 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()
// FIXME: make these private
ActorList process_list_;
- std::map<std::string, kernel::actor::ProcessArg*> actors_at_boot_;
+ std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
};
}
}
simgrid::kernel::actor::ProcessArg* arg =
new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
- host->pimpl_->actors_at_boot_.insert({actor_name, arg});
+ host->pimpl_->actors_at_boot_.emplace_back(arg);
if (start_time > SIMIX_get_clock()) {