X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f5b0811b85b583a9b66992386610b3536516487..b98e2e68753ffbe791c52a3f698fb1a3e726daec:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 371892ec8d..ca490824aa 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/ClusterZone.hpp" #include "simgrid/kernel/routing/DijkstraZone.hpp" #include "simgrid/kernel/routing/DragonflyZone.hpp" #include "simgrid/kernel/routing/EmptyZone.hpp" @@ -26,6 +25,7 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf_private.hpp" +#include #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -38,6 +38,9 @@ xbt::signal on_cluster_creation; } // namespace kernel } // namespace simgrid +static simgrid::kernel::routing::ClusterZoneCreationArgs + zone_cluster; /* temporary store data for irregular clusters, created with */ + /** The current NetZone in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; static simgrid::kernel::routing::NetZoneImpl* routing_get_current() @@ -150,6 +153,7 @@ void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) current_host->add_disk(new_disk); } +/*************************************************************************************************/ /** @brief Auxiliary function to create hosts */ static std::pair sg_platf_cluster_create_host(const simgrid::kernel::routing::ClusterCreationArgs* cluster, simgrid::s4u::NetZone* zone, @@ -195,13 +199,7 @@ static simgrid::s4u::Link* sg_platf_cluster_create_limiter(const simgrid::kernel simgrid::s4u::NetZone* zone, const std::vector& /*coord*/, int id) { - xbt_assert(static_cast(id) < cluster->radicals.size(), - "Zone(%s): error when creating limiter for host number %d in the zone. Insufficient number of radicals " - "available " - "(total = %zu). Check the 'radical' parameter in XML", - cluster->id.c_str(), id, cluster->radicals.size()); - - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(cluster->radicals[id]) + "_limiter"; + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id) + "_limiter"; XBT_DEBUG("Cluster: creating limiter link=%s bw=%f", link_id.c_str(), cluster->limiter_link); simgrid::s4u::Link* limiter = zone->create_link(link_id, cluster->limiter_link)->seal(); @@ -252,80 +250,89 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl zone->seal(); } +/*************************************************************************************************/ /** @brief Create regular Cluster */ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster) { - using simgrid::kernel::routing::ClusterZone; - - int rankId = 0; + auto* zone = simgrid::s4u::create_star_zone(cluster->id); + simgrid::s4u::NetZone const* parent = routing_get_current() ? routing_get_current()->get_iface() : nullptr; + if (parent) + zone->set_parent(parent); - // What an inventive way of initializing the NetZone that I have as ancestor :-( - simgrid::kernel::routing::ZoneCreationArgs zone; - zone.id = cluster->id; - zone.routing = "Cluster"; - sg_platf_new_Zone_begin(&zone); - auto* current_zone = static_cast(routing_get_current()); + /* set properties */ for (auto const& elm : cluster->properties) - current_zone->get_iface()->set_property(elm.first, elm.second); + zone->set_property(elm.first, elm.second); - if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { - current_zone->set_loopback(); - } + /* Make the backbone */ + simgrid::s4u::Link* backbone = nullptr; + if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { + std::string bb_name = std::string(cluster->id) + "_backbone"; + XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, + cluster->bb_lat); - if (cluster->limiter_link > 0) { - current_zone->set_limiter(); + backbone = zone->create_link(bb_name, std::vector{cluster->bb_bw}) + ->set_sharing_policy(cluster->bb_sharing_policy) + ->set_latency(cluster->bb_lat) + ->seal(); } for (int const& i : cluster->radicals) { std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; 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(); + const auto* host = zone->create_host(host_id, cluster->speeds) + ->set_core_count(cluster->core_amount) + ->set_properties(cluster->properties) + ->seal(); 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; - // every row describes a single node; every node may have multiple links. - // the first column may store a link from x to x if p_has_loopback is set - // the second column may store a limiter link if p_has_limiter is set - // other columns are to store one or more link for the node - // add a loopback link - simgrid::kernel::resource::LinkImpl* loopback = nullptr; if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { std::string loopback_name = link_id + "_loopback"; XBT_DEBUG("", loopback_name.c_str(), cluster->loopback_bw); - 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(); + auto* loopback = zone->create_link(loopback_name, std::vector{cluster->loopback_bw}) + ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) + ->set_latency(cluster->loopback_lat) + ->seal(); - current_zone->add_private_link_at(current_zone->node_pos(rankId), {loopback, loopback}); + zone->add_route(host->get_netpoint(), host->get_netpoint(), nullptr, nullptr, + std::vector{loopback}); } // add a limiter link (shared link to account for maximal bandwidth of the node) - simgrid::kernel::resource::LinkImpl* limiter = nullptr; + simgrid::s4u::Link* limiter = nullptr; if (cluster->limiter_link > 0) { std::string limiter_name = std::string(link_id) + "_limiter"; XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); - limiter = current_zone->create_link(limiter_name, std::vector{cluster->limiter_link})->seal()->get_impl(); + limiter = zone->create_link(limiter_name, std::vector{cluster->limiter_link})->seal(); + } - current_zone->add_private_link_at(current_zone->node_pos_with_loopback(rankId), {limiter, limiter}); + // create link + simgrid::s4u::Link* link_up; + simgrid::s4u::Link* link_down; + if (cluster->sharing_policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { + link_up = zone->create_link(link_id + "_UP", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + link_down = + zone->create_link(link_id + "_DOWN", std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + } else { + link_up = zone->create_link(link_id, std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + link_down = link_up; } - current_zone->set_link_characteristics(cluster->bw, cluster->lat, cluster->sharing_policy); - // call the cluster function that adds the others links - current_zone->create_links(i, rankId); - rankId++; + /* adding routes */ + std::vector links_up{limiter, link_up, backbone}; + std::vector links_down{backbone, link_down, limiter}; + links_up.erase(std::remove(links_up.begin(), links_up.end(), nullptr), links_up.end()); + links_down.erase(std::remove(links_down.begin(), links_down.end(), nullptr), links_down.end()); + + zone->add_route(host->get_netpoint(), nullptr, nullptr, nullptr, links_up, false); + zone->add_route(nullptr, host->get_netpoint(), nullptr, nullptr, links_down, false); } // Add a router. @@ -333,27 +340,14 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA 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_zone->set_router(current_zone->create_router(cluster->router_id)); + auto* router = zone->create_router(cluster->router_id); + zone->add_route(router, nullptr, nullptr, nullptr, {}); - // Make the backbone - if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - 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() - ->get_impl(); - current_zone->set_backbone(backbone); - } - - XBT_DEBUG(""); - sg_platf_new_Zone_seal(); + zone->seal(); + simgrid::kernel::routing::on_cluster_creation(*cluster); } -void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) +void sg_platf_new_tag_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) { switch (cluster->topology) { case simgrid::kernel::routing::ClusterTopology::TORUS: @@ -365,38 +359,93 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster sg_platf_new_cluster_flat(cluster); break; } - - simgrid::kernel::routing::on_cluster_creation(*cluster); +} +/*************************************************************************************************/ +/** @brief Set the links for internal node inside a Cluster(Star) */ +static void sg_platf_cluster_set_hostlink(simgrid::kernel::routing::StarZone* zone, + simgrid::kernel::routing::NetPoint* netpoint, + const simgrid::s4u::Link* link_up, const simgrid::s4u::Link* link_down, + simgrid::kernel::resource::LinkImpl* backbone) +{ + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); + if (backbone) { + zone->add_route(netpoint, nullptr, nullptr, nullptr, {link_up->get_impl(), backbone}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {backbone, link_down->get_impl()}, false); + } else { + zone->add_route(netpoint, nullptr, nullptr, nullptr, {link_up->get_impl()}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {link_down->get_impl()}, false); + } } -void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) +/** @brief Add a link connecting a host to the rest of its StarZone */ +static void sg_platf_build_hostlink(simgrid::kernel::routing::StarZone* zone, + const simgrid::kernel::routing::HostLinkCreationArgs* hostlink, + simgrid::kernel::resource::LinkImpl* backbone) { - auto* cluster = dynamic_cast(current_routing); + simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); - xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); - xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname()); + const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); + const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); - cluster->set_backbone(bb); - XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname()); + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); + sg_platf_cluster_set_hostlink(zone, netpoint, linkUp, linkDown, backbone); } -void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args) +/** @brief Create a cabinet (set of hosts) inside a Cluster(StarZone) */ +static void sg_platf_build_cabinet(simgrid::kernel::routing::StarZone* zone, + const simgrid::kernel::routing::CabinetCreationArgs* args, + simgrid::kernel::resource::LinkImpl* backbone) { - auto* zone = static_cast(routing_get_current()); 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(); const auto* link_up = zone->create_link("link_" + id + "_UP", std::vector{args->bw})->set_latency(args->lat)->seal(); - const 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()}); + sg_platf_cluster_set_hostlink(zone, host->get_netpoint(), link_up, link_down, backbone); } } +static void sg_platf_zone_cluster_populate(const simgrid::kernel::routing::ClusterZoneCreationArgs* cluster) +{ + auto* zone = dynamic_cast(current_routing); + xbt_assert(zone, "Host_links are only valid for Cluster(Star)"); + + simgrid::kernel::resource::LinkImpl* backbone = nullptr; + /* create backbone */ + if (cluster->backbone) { + sg_platf_new_link(cluster->backbone.get()); + backbone = simgrid::s4u::Link::by_name(cluster->backbone->id)->get_impl(); + } + + /* create host_links for hosts */ + for (auto const& hostlink : cluster->host_links) { + sg_platf_build_hostlink(zone, &hostlink, backbone); + } + + /* create cabinets */ + for (auto const& cabinet : cluster->cabinets) { + sg_platf_build_cabinet(zone, &cabinet, backbone); + } +} + +void routing_cluster_add_backbone(std::unique_ptr link) +{ + zone_cluster.backbone = std::move(link); +} + +void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args) +{ + xbt_assert(args, "Invalid nullptr argument"); + zone_cluster.cabinets.emplace_back(*args); +} + +/*************************************************************************************************/ void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { routing_get_current()->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, @@ -451,7 +500,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) 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::timer::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, nullptr); new_actor->set_properties(arg->properties); @@ -493,13 +542,7 @@ sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { - new_zone = new simgrid::kernel::routing::ClusterZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) { - new_zone = new simgrid::kernel::routing::DragonflyZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) { - new_zone = new simgrid::kernel::routing::TorusZone(zone->id); - } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) { - new_zone = new simgrid::kernel::routing::FatTreeZone(zone->id); + new_zone = new simgrid::kernel::routing::StarZone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false); } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { @@ -534,7 +577,8 @@ sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) */ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone) { - current_routing = sg_platf_create_zone(zone); + zone_cluster.routing = zone->routing; + current_routing = sg_platf_create_zone(zone); return current_routing; } @@ -555,6 +599,13 @@ void sg_platf_new_Zone_set_properties(const std::unordered_mapseal(); current_routing = current_routing->get_parent(); } @@ -562,24 +613,8 @@ void sg_platf_new_Zone_seal() /** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink) { - const simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); - xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); - xbt_assert(dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi Zones can get a host_link."); - - const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); - const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); - - 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* cluster_zone = static_cast(current_routing); - - 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()); - cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}); + xbt_assert(hostlink, "Invalid nullptr parameter"); + zone_cluster.host_links.emplace_back(*hostlink); } void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args)