X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5f4329821ed097d617ccb739e1dd1b22caaadf92..62983a196bc73bd07ce7b780297fa51528822860:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c71b8b2dda..a0853f368e 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -38,9 +38,7 @@ xbt::signal on_cluster_creation; } // namespace kernel } // namespace simgrid -static int surf_parse_models_setup_already_called = 0; - -/** The current AS in the parsing */ +/** The current NetZone in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; static simgrid::kernel::routing::NetZoneImpl* routing_get_current() { @@ -59,32 +57,24 @@ void sg_platf_exit() simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); simgrid::s4u::Engine::on_platform_created.disconnect_slots(); - /* make sure that we will reinit the models while loading the platf once reinited */ - surf_parse_models_setup_already_called = 0; surf_parse_lex_destroy(); } -/** @brief Add a host to the current AS */ +/** @brief Add a host to the current NetZone */ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) { - simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount); - - if (args->properties) { - host->set_properties(*args->properties); - delete args->properties; - } + simgrid::s4u::Host* host = routing_get_current() + ->create_host(args->id, args->speed_per_pstate) + ->set_coordinates(args->coord) + ->set_properties(args->properties); - host->pimpl_->set_disks(args->disks, host); + host->get_impl()->set_disks(args->disks); - /* Change from the defaults */ - if (args->state_trace) - host->set_state_profile(args->state_trace); - if (args->speed_trace) - host->set_speed_profile(args->speed_trace); - if (not args->coord.empty()) - new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); + host->pimpl_cpu->set_core_count(args->core_amount) + ->set_state_profile(args->state_trace) + ->set_speed_profile(args->speed_trace); - simgrid::s4u::Host::on_creation(*host); // notify the signal + host->seal(); /* When energy plugin is activated, changing the pstate requires to already have the HostEnergy extension whose * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emition */ @@ -93,10 +83,8 @@ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const char* coords) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const std::string& coords) { - if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name), "Refusing to create a router named '%s': this name already describes a node.", name.c_str()); @@ -104,30 +92,24 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, netpoint->set_englobing_zone(current_routing); XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id()); - if (coords && strcmp(coords, "")) - new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); + if (not coords.empty()) + netpoint->set_coordinates(coords); return netpoint; } static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name) { - simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->policy); - if (args->policy != simgrid::s4u::Link::SharingPolicy::WIFI) - link->get_impl()->set_latency(args->latency); - - if (args->properties) - link->set_properties(*args->properties); - - simgrid::kernel::resource::LinkImpl* l = link->get_impl(); - if (args->latency_trace) - l->set_latency_profile(args->latency_trace); - if (args->bandwidth_trace) - l->set_bandwidth_profile(args->bandwidth_trace); - if (args->state_trace) - l->set_state_profile(args->state_trace); - - link->seal(); + routing_get_current() + ->create_link(link_name, args->bandwidths) + ->set_properties(args->properties) + ->get_impl() // this call to get_impl saves some simcalls but can be removed + ->set_sharing_policy(args->policy) + ->set_state_profile(args->state_trace) + ->set_latency_profile(args->latency_trace) + ->set_bandwidth_profile(args->bandwidth_trace) + ->set_latency(args->latency) + ->seal(); } void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link) @@ -138,7 +120,6 @@ void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link) } else { sg_platf_new_link(link, link->id); } - delete link->properties; } void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) @@ -150,7 +131,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster int rankId = 0; - // What an inventive way of initializing the AS that I have as ancestor :-( + // What an inventive way of initializing the NetZone that I have as ancestor :-( simgrid::kernel::routing::ZoneCreationArgs zone; zone.id = cluster->id; switch (cluster->topology) { @@ -168,44 +149,31 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster break; } sg_platf_new_Zone_begin(&zone); - auto* current_as = static_cast(routing_get_current()); - current_as->parse_specific_arguments(cluster); - if (cluster->properties != nullptr) - for (auto const& elm : *cluster->properties) - current_as->get_iface()->set_property(elm.first, elm.second); + auto* current_zone = static_cast(routing_get_current()); + current_zone->parse_specific_arguments(cluster); + for (auto const& elm : cluster->properties) + current_zone->get_iface()->set_property(elm.first, elm.second); if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { - current_as->num_links_per_node_++; - current_as->has_loopback_ = true; + current_zone->set_loopback(); } if (cluster->limiter_link > 0) { - current_as->num_links_per_node_++; - current_as->has_limiter_ = true; + current_zone->set_limiter(); } - for (int const& i : *cluster->radicals) { + for (int const& i : cluster->radicals) { std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); - - XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); - simgrid::kernel::routing::HostCreationArgs host; - host.id = host_id; - if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::unordered_map(); + XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); + current_zone->create_host(host_id, cluster->speeds) + ->set_core_count(cluster->core_amount) + ->set_properties(cluster->properties) + ->seal(); - for (auto const& elm : *cluster->properties) - host.properties->insert({elm.first, elm.second}); - } - - host.speed_per_pstate = cluster->speeds; - host.pstate = 0; - host.core_amount = cluster->core_amount; - host.coord = ""; - sg_platf_new_host(&host); XBT_DEBUG(""); + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); XBT_DEBUG("", link_id.c_str(), cluster->bw, cluster->lat); // All links are saved in a matrix; @@ -215,80 +183,63 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // other columns are to store one or more link for the node // add a loopback link - const simgrid::s4u::Link* linkUp = nullptr; - const simgrid::s4u::Link* linkDown = nullptr; if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { - std::string tmp_link = link_id + "_loopback"; - XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); - - simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; - link.bandwidths.push_back(cluster->loopback_bw); - link.latency = cluster->loopback_lat; - link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; - sg_platf_new_link(&link); - linkUp = simgrid::s4u::Link::by_name_or_null(tmp_link); - linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); - - ClusterZone* as_cluster = current_as; - as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); + std::string loopback_name = link_id + "_loopback"; + XBT_DEBUG("", loopback_name.c_str(), cluster->loopback_bw); + + auto* loopback = current_zone->create_link(loopback_name, std::vector{cluster->loopback_bw}) + ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) + ->set_latency(cluster->loopback_lat) + ->seal() + ->get_impl(); + + current_zone->add_private_link_at(current_zone->node_pos(rankId), {loopback, loopback}); } // add a limiter link (shared link to account for maximal bandwidth of the node) - linkUp = nullptr; - linkDown = nullptr; if (cluster->limiter_link > 0) { - std::string tmp_link = std::string(link_id) + "_limiter"; - XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - - simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; - link.bandwidths.push_back(cluster->limiter_link); - link.latency = 0; - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; - sg_platf_new_link(&link); - linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); - linkUp = linkDown; - current_as->private_links_.insert( - {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); + std::string limiter_name = std::string(link_id) + "_limiter"; + XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); + + auto* limiter = + current_zone->create_link(limiter_name, std::vector{cluster->limiter_link})->seal()->get_impl(); + + current_zone->add_private_link_at(current_zone->node_pos_with_loopback(rankId), {limiter, limiter}); } // call the cluster function that adds the others links if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) { - static_cast(current_as)->add_processing_node(i); + static_cast(current_zone)->add_processing_node(i); } else { - current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId)); + current_zone->create_links_for_node(cluster, i, rankId, current_zone->node_pos_with_loopback_limiter(rankId)); } rankId++; } - delete cluster->properties; // Add a router. XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id.c_str()); if (cluster->router_id.empty()) cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; - current_as->router_ = sg_platf_new_router(cluster->router_id, nullptr); + current_zone->set_router(sg_platf_new_router(cluster->router_id, "")); // Make the backbone if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - simgrid::kernel::routing::LinkCreationArgs link; - link.id = std::string(cluster->id) + "_backbone"; - link.bandwidths.push_back(cluster->bb_bw); - link.latency = cluster->bb_lat; - link.policy = cluster->bb_sharing_policy; - - XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); - sg_platf_new_link(&link); - - routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); + std::string bb_name = std::string(cluster->id) + "_backbone"; + XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, + cluster->bb_lat); + + auto* backbone = current_zone->create_link(bb_name, std::vector{cluster->bb_bw}) + ->set_sharing_policy(cluster->bb_sharing_policy) + ->set_latency(cluster->bb_lat) + ->seal(); + current_zone->set_backbone(backbone->get_impl()); } - XBT_DEBUG(""); + XBT_DEBUG(""); sg_platf_new_Zone_seal(); simgrid::kernel::routing::on_cluster_creation(*cluster); - delete cluster->radicals; } void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) @@ -296,48 +247,34 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) auto* cluster = dynamic_cast(current_routing); xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); - xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->get_cname()); + xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname()); - cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); + cluster->set_backbone(bb); + XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname()); } void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet) { - for (int const& radical : *cabinet->radicals) { - std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; - simgrid::kernel::routing::HostCreationArgs host; - host.pstate = 0; - host.core_amount = 1; - host.id = hostname; - host.speed_per_pstate.push_back(cabinet->speed); - sg_platf_new_host(&host); - - simgrid::kernel::routing::LinkCreationArgs link; - link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; - link.latency = cabinet->lat; - link.bandwidths.push_back(cabinet->bw); - link.id = "link_" + hostname; - sg_platf_new_link(&link); - - simgrid::kernel::routing::HostLinkCreationArgs host_link; - host_link.id = hostname; - host_link.link_up = std::string("link_") + hostname + "_UP"; - host_link.link_down = std::string("link_") + hostname + "_DOWN"; - sg_platf_new_hostlink(&host_link); + auto* zone = static_cast(routing_get_current()); + for (int const& radical : cabinet->radicals) { + std::string id = cabinet->prefix + std::to_string(radical) + cabinet->suffix; + simgrid::s4u::Host* host = zone->create_host(id, std::vector{cabinet->speed})->seal(); + + simgrid::s4u::Link* link_up = + zone->create_link("link_" + id + "_UP", std::vector{cabinet->bw})->set_latency(cabinet->lat)->seal(); + simgrid::s4u::Link* link_down = + zone->create_link("link_" + id + "_DOWN", std::vector{cabinet->bw})->set_latency(cabinet->lat)->seal(); + + zone->add_private_link_at(host->get_netpoint()->id(), {link_up->get_impl(), link_down->get_impl()}); } - delete cabinet->radicals; } simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) { - simgrid::kernel::resource::DiskImpl* pimpl = - routing_get_current()->create_disk(disk->id, disk->read_bw, disk->write_bw)->get_impl(); - - if (disk->properties) { - pimpl->set_properties(*disk->properties); - delete disk->properties; - } + simgrid::kernel::resource::DiskImpl* pimpl = routing_get_current() + ->create_disk(disk->id, disk->read_bw, disk->write_bw) + ->set_properties(disk->properties) + ->get_impl(); pimpl->seal(); simgrid::s4u::Disk::on_creation(*pimpl->get_iface()); @@ -387,20 +324,21 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::string actor_name = actor->args[0]; simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); - std::shared_ptr> properties(actor->properties); - auto* arg = - new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); + auto* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties, + auto_restart); - host->pimpl_->add_actor_at_boot(arg); + host->get_impl()->add_actor_at_boot(arg); if (start_time > SIMIX_get_clock()) { - arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); + arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties, + auto_restart); XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); simgrid::simix::Timer::set(start_time, [arg, auto_restart]() { - simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create( - arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr); + simgrid::kernel::actor::ActorImplPtr new_actor = + simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), arg->code, arg->data, arg->host, nullptr); + new_actor->set_properties(arg->properties); if (arg->kill_time >= 0) new_actor->set_kill_time(arg->kill_time); if (auto_restart) @@ -412,8 +350,8 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) try { simgrid::kernel::actor::ActorImplPtr new_actor = nullptr; - new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, - arg->properties.get(), nullptr); + new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, nullptr); + new_actor->set_properties(arg->properties); /* The actor creation will fail if the host is currently dead, but that's fine */ if (arg->kill_time >= 0) new_actor->set_kill_time(arg->kill_time); @@ -427,62 +365,17 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer) { - auto* as = dynamic_cast(current_routing); - xbt_assert(as, " tag can only be used in Vivaldi netzones."); + auto* zone = dynamic_cast(current_routing); + xbt_assert(zone, " tag can only be used in Vivaldi netzones."); - std::vector speed_per_pstate; - speed_per_pstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1); + simgrid::s4u::Host* host = zone->create_host(peer->id, std::vector{peer->speed}) + ->set_state_profile(peer->state_trace) + ->set_speed_profile(peer->speed_trace) + ->set_coordinates(peer->coord) + ->seal(); - as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); - - /* Change from the defaults */ - if (peer->state_trace) - host->set_state_profile(peer->state_trace); - if (peer->speed_trace) - host->set_speed_profile(peer->speed_trace); - simgrid::s4u::Host::on_creation(*host); // notify the signal + zone->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out); } - -/* Pick the right models for CPU, net and host, and call their model_init_preparse */ -static void surf_config_models_setup() -{ - std::string host_model_name = simgrid::config::get_value("host/model"); - std::string network_model_name = simgrid::config::get_value("network/model"); - std::string cpu_model_name = simgrid::config::get_value("cpu/model"); - std::string disk_model_name = simgrid::config::get_value("disk/model"); - - /* The compound host model is needed when using non-default net/cpu models */ - if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && - simgrid::config::is_default("host/model")) { - host_model_name = "compound"; - simgrid::config::set_value("host/model", host_model_name); - } - - XBT_DEBUG("host model: %s", host_model_name.c_str()); - if (host_model_name == "compound") { - xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); - xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model"); - - int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); - surf_cpu_model_description[cpu_id].model_init_preparse(); - - int network_id = find_model_description(surf_network_model_description, network_model_name); - surf_network_model_description[network_id].model_init_preparse(); - } - - XBT_DEBUG("Call host_model_init"); - int host_id = find_model_description(surf_host_model_description, host_model_name); - surf_host_model_description[host_id].model_init_preparse(); - - XBT_DEBUG("Call vm_model_init"); - surf_vm_model_init_HL13(); - - XBT_DEBUG("Call disk_model_init"); - int disk_id = find_model_description(surf_disk_model_description, disk_model_name); - surf_disk_model_description[disk_id].model_init_preparse(); -} - /** * @brief Auxiliary function to build the object NetZoneImpl * @@ -523,21 +416,6 @@ sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) } new_zone->set_parent(current_routing); - if (current_routing == nullptr) { /* it is the first one */ - simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface()); - } else { - /* set the father behavior */ - if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; - /* add to the sons dictionary */ - current_routing->get_children()->push_back(new_zone); - /* set models from parent netzone */ - new_zone->set_network_model(current_routing->get_network_model()); - new_zone->set_cpu_pm_model(current_routing->get_cpu_pm_model()); - new_zone->set_cpu_vm_model(current_routing->get_cpu_vm_model()); - new_zone->set_disk_model(current_routing->get_disk_model()); - new_zone->set_host_model(current_routing->get_host_model()); - } return new_zone; } @@ -559,20 +437,6 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::ke */ auto* new_zone = sg_platf_create_zone(zone); - if (not surf_parse_models_setup_already_called) { - simgrid::s4u::Engine::on_platform_creation(); - - /* Initialize the surf models. That must be done after we got all config, and before we need the models. - * That is, after the last tag, if any, and before the first of cluster|peer|zone|trace|trace_connect - * - * I'm not sure for and , there may be a bug here - * (FIXME: check it out by creating a file beginning with one of these tags) - * but cluster and peer come down to zone creations, so putting this verification here is correct. - */ - surf_parse_models_setup_already_called = 1; - surf_config_models_setup(); - } - _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent * any further config now that we created some real content */ @@ -583,12 +447,11 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::ke return new_zone; } -void sg_platf_new_Zone_set_properties(const std::unordered_map* props) +void sg_platf_new_Zone_set_properties(const std::unordered_map& props) { xbt_assert(current_routing, "Cannot set properties of the current Zone: none under construction"); - if (props) - current_routing->set_properties(*props); + current_routing->set_properties(props); } /** @@ -602,7 +465,7 @@ void sg_platf_new_Zone_seal() xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction"); current_routing->seal(); simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); - current_routing = current_routing->get_father(); + current_routing = current_routing->get_parent(); } /** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */ @@ -619,13 +482,13 @@ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); - auto* as_cluster = static_cast(current_routing); + auto* cluster_zone = static_cast(current_routing); - if (as_cluster->private_links_.find(netpoint->id()) != as_cluster->private_links_.end()) + if (cluster_zone->private_link_exists_at(netpoint->id())) surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); - as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}}); + cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}); } void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile)