std::vector<surf::LinkImpl*> links;
};
-NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name)
+NetZoneImpl::NetZoneImpl(NetZone* father, std::string name) : NetZone(father, name)
{
- xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name),
- "Refusing to create a second NetZone called '%s'.", name);
+ xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name.c_str()),
+ "Refusing to create a second NetZone called '%s'.", name.c_str());
netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast<NetZoneImpl*>(father));
- XBT_DEBUG("NetZone '%s' created with the id '%u'", name, netpoint_->id());
+ XBT_DEBUG("NetZone '%s' created with the id '%u'", name.c_str(), netpoint_->id());
}
+
NetZoneImpl::~NetZoneImpl()
{
- for (auto& kv : bypassRoutes_)
+ for (auto const& kv : bypassRoutes_)
delete kv.second;
simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_);
}
simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
- std::unordered_map<std::string, std::string>* props)
+ std::map<std::string, std::string>* props)
{
simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
if (props != nullptr)
- for (auto kv : *props)
- res->setProperty(kv.first.c_str(), kv.second.c_str());
+ for (auto const& kv : *props)
+ res->setProperty(kv.first, kv.second);
simgrid::s4u::Host::onCreation(*res); // notify the signal
/* Build a copy that will be stored in the dict */
kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(e_route->gw_src, e_route->gw_dst);
- for (auto link : *e_route->link_list)
+ for (auto const& link : *e_route->link_list)
newRoute->links.push_back(link);
/* Store it */
if (dst->netzone() == this && src->netzone() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::LinkImpl* link : bypassedRoute->links) {
+ for (surf::LinkImpl* const& link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
for (int i = 0; i < max; i++) {
if (i <= max_index_src && max <= max_index_dst) {
key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_};
- try {
- bypassedRoute = bypassRoutes_.at(key);
+ auto bpr = bypassRoutes_.find(key);
+ if (bpr != bypassRoutes_.end()) {
+ bypassedRoute = bpr->second;
break;
- } catch (std::out_of_range& unfound) {
- // Do nothing
}
}
if (max <= max_index_src && i <= max_index_dst) {
key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_};
- try {
- bypassedRoute = bypassRoutes_.at(key);
+ auto bpr = bypassRoutes_.find(key);
+ if (bpr != bypassRoutes_.end()) {
+ bypassedRoute = bpr->second;
break;
- } catch (std::out_of_range& unfound) {
- // Do nothing
}
}
}
if (max <= max_index_src && max <= max_index_dst) {
key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_};
- try {
- bypassedRoute = bypassRoutes_.at(key);
+ auto bpr = bypassRoutes_.find(key);
+ if (bpr != bypassRoutes_.end()) {
+ bypassedRoute = bpr->second;
break;
- } catch (std::out_of_range& unfound) {
- // Do nothing
}
}
}
src->cname(), dst->cname(), bypassedRoute->links.size());
if (src != key.first)
getGlobalRoute(src, bypassedRoute->gw_src, links, latency);
- for (surf::LinkImpl* link : bypassedRoute->links) {
+ for (surf::LinkImpl* const& link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
/* If source gateway is not our source, we have to recursively find our way up to this point */
if (src != route.gw_src)
getGlobalRoute(src, route.gw_src, links, latency);
- for (auto link : *route.link_list)
+ for (auto const& link : *route.link_list)
links->push_back(link);
delete route.link_list;