From 2ccf4cc115bbe75120d9264dc17ea7f7fed551e8 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Thu, 15 Apr 2021 15:55:30 +0200 Subject: [PATCH] cosmetics --- src/kernel/routing/VivaldiZone.cpp | 10 ++--- src/surf/sg_platf.cpp | 71 ++++++++++++++---------------- 2 files changed, 38 insertions(+), 43 deletions(-) diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp index c025ce27d6..577dc7a1dd 100644 --- a/src/kernel/routing/VivaldiZone.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -68,12 +68,10 @@ void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out) std::string link_up = "link_" + netpoint->get_name() + "_UP"; std::string link_down = "link_" + netpoint->get_name() + "_DOWN"; - resource::LinkImpl* linkUp = get_network_model()->create_link(link_up, std::vector(1, bw_out)); - linkUp->seal(); - resource::LinkImpl* linkDown = get_network_model()->create_link(link_down, std::vector(1, bw_in)); - linkDown->seal(); - add_route(netpoint, nullptr, nullptr, nullptr, {linkUp}, false); - add_route(nullptr, netpoint, nullptr, nullptr, {linkDown}, false); + auto* linkUp = create_link(link_up, std::vector{bw_out})->seal(); + auto* linkDown = create_link(link_down, std::vector{bw_in})->seal(); + add_route(netpoint, nullptr, nullptr, nullptr, {linkUp->get_impl()}, false); + add_route(nullptr, netpoint, nullptr, nullptr, {linkDown->get_impl()}, false); } void VivaldiZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index f021818bc2..9a67956c3c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -92,6 +92,20 @@ void sg_platf_new_host_seal(int pstate) current_host = nullptr; } +void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* args) +{ + auto* zone = dynamic_cast(current_routing); + xbt_assert(zone, " tag can only be used in Vivaldi netzones."); + + auto* peer = zone->create_host(args->id, std::vector{args->speed}) + ->set_state_profile(args->state_trace) + ->set_speed_profile(args->speed_trace) + ->set_coordinates(args->coord) + ->seal(); + + zone->set_peer_link(peer->get_netpoint(), args->bw_in, args->bw_out); +} + /** @brief Add a "router" to the network element list */ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const std::string& coords) { @@ -269,23 +283,20 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname()); } -void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet) +void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args) { auto* zone = static_cast(routing_get_current()); - for (int const& radical : cabinet->radicals) { - std::string id = cabinet->prefix + std::to_string(radical) + cabinet->suffix; - auto const* netpoint = zone->create_host(id, std::vector{cabinet->speed})->seal()->get_netpoint(); - - auto* link_up = zone->create_link("link_" + id + "_UP", std::vector{cabinet->bw}) - ->set_latency(cabinet->lat) - ->seal() - ->get_impl(); - auto* link_down = zone->create_link("link_" + id + "_DOWN", std::vector{cabinet->bw}) - ->set_latency(cabinet->lat) - ->seal() - ->get_impl(); - - zone->add_private_link_at(netpoint->id(), {link_up, link_down}); + for (int const& radical : args->radicals) { + std::string id = args->prefix + std::to_string(radical) + args->suffix; + auto const* host = zone->create_host(id, std::vector{args->speed})->seal(); + + auto* link_up = + zone->create_link("link_" + id + "_UP", std::vector{args->bw})->set_latency(args->lat)->seal(); + + auto* link_down = + zone->create_link("link_" + id + "_DOWN", std::vector{args->bw})->set_latency(args->lat)->seal(); + + zone->add_private_link_at(host->get_netpoint()->id(), {link_up->get_impl(), link_down->get_impl()}); } } @@ -371,20 +382,6 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } } -void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer) -{ - auto* zone = dynamic_cast(current_routing); - xbt_assert(zone, " tag can only be used in Vivaldi netzones."); - - auto* netpoint = 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() - ->get_netpoint(); - - zone->set_peer_link(netpoint, peer->bw_in, peer->bw_out); -} /** * @brief Auxiliary function to build the object NetZoneImpl * @@ -500,15 +497,15 @@ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}); } -void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile) +void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args) { - simgrid::kernel::profile::Profile* mgr_profile; - if (not profile->file.empty()) { - mgr_profile = simgrid::kernel::profile::Profile::from_file(profile->file); + simgrid::kernel::profile::Profile* profile; + if (not args->file.empty()) { + profile = simgrid::kernel::profile::Profile::from_file(args->file); } else { - xbt_assert(not profile->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", - profile->id.c_str()); - mgr_profile = simgrid::kernel::profile::Profile::from_string(profile->id, profile->pc_data, profile->periodicity); + xbt_assert(not args->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + args->id.c_str()); + profile = simgrid::kernel::profile::Profile::from_string(args->id, args->pc_data, args->periodicity); } - traces_set_list.insert({profile->id, mgr_profile}); + traces_set_list.insert({args->id, profile}); } -- 2.20.1