X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54848f1b36dd4b0b508a77de74dfad59dd439a08..d236809e6149a03ef3e53599458f51c98f79f94d:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index b5b22aa0aa..251c3ce2df 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,29 +1,29 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/Exception.hpp" -#include "simgrid/kernel/routing/DijkstraZone.hpp" -#include "simgrid/kernel/routing/DragonflyZone.hpp" -#include "simgrid/kernel/routing/EmptyZone.hpp" -#include "simgrid/kernel/routing/FatTreeZone.hpp" -#include "simgrid/kernel/routing/FloydZone.hpp" -#include "simgrid/kernel/routing/FullZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "simgrid/kernel/routing/NetZoneImpl.hpp" -#include "simgrid/kernel/routing/TorusZone.hpp" -#include "simgrid/kernel/routing/VivaldiZone.hpp" -#include "simgrid/kernel/routing/WifiZone.hpp" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/NetZone.hpp" -#include "src/include/simgrid/sg_config.hpp" -#include "src/include/surf/surf.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/resource/DiskImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" -#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" +#include "src/surf/xml/platf.hpp" #include "src/surf/xml/platf_private.hpp" #include @@ -56,7 +56,6 @@ void sg_platf_init() void sg_platf_exit() { simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); - simgrid::s4u::Engine::on_platform_created.disconnect_slots(); surf_parse_lex_destroy(); } @@ -109,30 +108,27 @@ void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* args) simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const std::string& coords) { auto* netpoint = current_routing->create_router(name)->set_coordinates(coords); - XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id()); + XBT_DEBUG("Router '%s' has the id %lu", netpoint->get_cname(), netpoint->id()); return netpoint; } -static void sg_platf_set_link_properties(simgrid::s4u::Link* link, - const simgrid::kernel::routing::LinkCreationArgs* args) -{ - link->set_properties(args->properties) - ->set_state_profile(args->state_trace) - ->set_latency_profile(args->latency_trace) - ->set_bandwidth_profile(args->bandwidth_trace) - ->set_latency(args->latency); -} - void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args) { simgrid::s4u::Link* link; if (args->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { link = current_routing->create_split_duplex_link(args->id, args->bandwidths); } else { - link = current_routing->create_link(args->id, args->bandwidths)->set_sharing_policy(args->policy); + link = current_routing->create_link(args->id, args->bandwidths); + link->get_impl()->set_sharing_policy(args->policy, {}); } - sg_platf_set_link_properties(link, args); + + link->set_properties(args->properties) + ->set_state_profile(args->state_trace) + ->set_latency_profile(args->latency_trace) + ->set_bandwidth_profile(args->bandwidth_trace) + ->set_latency(args->latency); + link->seal(); } @@ -150,10 +146,10 @@ void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* 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, - const std::vector& /*coord*/, int id) + const std::vector& /*coord*/, unsigned long id) { xbt_assert(static_cast(id) < cluster->radicals.size(), - "Zone(%s): error when creating host number %d in the zone. Insufficient number of radicals available " + "Zone(%s): error when creating host number %lu in the zone. Insufficient number of radicals available " "(total = %zu). Check the 'radical' parameter in XML", cluster->id.c_str(), id, cluster->radicals.size()); @@ -169,11 +165,12 @@ sg_platf_cluster_create_host(const simgrid::kernel::routing::ClusterCreationArgs /** @brief Auxiliary function to create loopback links */ static simgrid::s4u::Link* sg_platf_cluster_create_loopback(const simgrid::kernel::routing::ClusterCreationArgs* cluster, - simgrid::s4u::NetZone* zone, const std::vector& /*coord*/, int id) + simgrid::s4u::NetZone* zone, const std::vector& /*coord*/, + unsigned long id) { xbt_assert(static_cast(id) < cluster->radicals.size(), - "Zone(%s): error when creating loopback for host number %d in the zone. Insufficient number of radicals " - "available " + "Zone(%s): error when creating loopback for host number %lu in the zone. Insufficient number of " + "radicals available " "(total = %zu). Check the 'radical' parameter in XML", cluster->id.c_str(), id, cluster->radicals.size()); @@ -190,7 +187,8 @@ sg_platf_cluster_create_loopback(const simgrid::kernel::routing::ClusterCreation /** @brief Auxiliary function to create limiter links */ static simgrid::s4u::Link* sg_platf_cluster_create_limiter(const simgrid::kernel::routing::ClusterCreationArgs* cluster, simgrid::s4u::NetZone* zone, - const std::vector& /*coord*/, int id) + const std::vector& /*coord*/, + unsigned long id) { 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); @@ -220,27 +218,25 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl } simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr; - simgrid::s4u::NetZone* zone; switch (cluster->topology) { case simgrid::kernel::routing::ClusterTopology::TORUS: - zone = simgrid::s4u::create_torus_zone( - cluster->id, parent, TorusZone::parse_topo_parameters(cluster->topo_parameters), - {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy); + simgrid::s4u::create_torus_zone(cluster->id, parent, TorusZone::parse_topo_parameters(cluster->topo_parameters), + {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, + cluster->sharing_policy); break; case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: - zone = simgrid::s4u::create_dragonfly_zone( + simgrid::s4u::create_dragonfly_zone( cluster->id, parent, DragonflyZone::parse_topo_parameters(cluster->topo_parameters), {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy); break; case simgrid::kernel::routing::ClusterTopology::FAT_TREE: - zone = simgrid::s4u::create_fatTree_zone( + simgrid::s4u::create_fatTree_zone( cluster->id, parent, FatTreeZone::parse_topo_parameters(cluster->topo_parameters), {set_host, set_loopback, set_limiter}, cluster->bw, cluster->lat, cluster->sharing_policy); break; default: THROW_IMPOSSIBLE; } - zone->seal(); } /*************************************************************************************************/ @@ -333,7 +329,6 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA auto* router = zone->create_router(cluster->router_id); zone->add_route(router, nullptr, nullptr, nullptr, {}); - zone->seal(); simgrid::kernel::routing::on_cluster_creation(*cluster); } @@ -357,7 +352,7 @@ static void sg_platf_cluster_set_hostlink(simgrid::kernel::routing::StarZone* zo const simgrid::s4u::Link* link_up, const simgrid::s4u::Link* link_down, const simgrid::s4u::Link* backbone) { - XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); + XBT_DEBUG("Push Host_link for host '%s' to position %lu", netpoint->get_cname(), netpoint->id()); simgrid::s4u::LinkInRoute linkUp{link_up}; simgrid::s4u::LinkInRoute linkDown{link_down}; if (backbone) { @@ -375,11 +370,12 @@ static void sg_platf_build_hostlink(simgrid::kernel::routing::StarZone* zone, const simgrid::kernel::routing::HostLinkCreationArgs* hostlink, const simgrid::s4u::Link* backbone) { - simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); + const auto engine = simgrid::s4u::Engine::get_instance(); + auto netpoint = engine->host_by_name(hostlink->id)->get_netpoint(); xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); - 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); + const auto linkUp = engine->link_by_name_or_null(hostlink->link_up); + const auto linkDown = engine->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()); @@ -450,13 +446,14 @@ void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* rout void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) { + const auto* engine = simgrid::s4u::Engine::get_instance(); sg_host_t host = sg_host_by_name(actor->host); if (not host) { // The requested host does not exist. Do a nice message to the user std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + std::vector list = engine->get_all_hosts(); for (auto const& some_host : list) { msg += some_host->get_name(); @@ -469,8 +466,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } xbt_die("%s", msg.c_str()); } - const simgrid::kernel::actor::ActorCodeFactory& factory = - simgrid::kernel::EngineImpl::get_instance()->get_function(actor->function); + const simgrid::kernel::actor::ActorCodeFactory& factory = engine->get_impl()->get_function(actor->function); xbt_assert(factory, "Error while creating an actor from the XML file: Function '%s' not registered", actor->function); double start_time = actor->start_time; @@ -521,7 +517,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) /** * @brief Auxiliary function to build the object NetZoneImpl * - * Builds the objects, setting its father properties and root netzone if needed + * Builds the objects, setting its parent properties and root netzone if needed * @param zone the parameters defining the Zone to build. * @return Pointer to recently created netzone */ @@ -598,7 +594,6 @@ void sg_platf_new_zone_seal() zone_cluster.cabinets.clear(); zone_cluster.backbone.reset(); } - current_routing->seal(); current_routing = current_routing->get_parent(); }