X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89feb425bdeb4351ac0e27a38d9a9b3463fff433..7f626fa7e7d9a7d28fdc994ae197f82f0a0c6e52:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 0ded0be000..f7f483788a 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 @@ -31,13 +31,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -namespace simgrid { -namespace kernel { -namespace routing { +namespace simgrid::kernel::routing { xbt::signal on_cluster_creation; -} // namespace routing -} // namespace kernel -} // namespace simgrid +} // namespace simgrid::kernel::routing static simgrid::kernel::routing::ClusterZoneCreationArgs zone_cluster; /* temporary store data for irregular clusters, created with */ @@ -56,7 +52,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(); } @@ -96,7 +91,7 @@ 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."); - const auto* peer = zone->create_host(args->id, std::vector{args->speed}) + const auto* peer = zone->create_host(args->id, {args->speed}) ->set_state_profile(args->state_trace) ->set_speed_profile(args->speed_trace) ->set_coordinates(args->coord) @@ -109,30 +104,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 +142,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 +161,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 +183,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 +214,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(); } /*************************************************************************************************/ @@ -248,13 +240,12 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster) { auto* zone = simgrid::s4u::create_star_zone(cluster->id); - simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr; - if (parent) + if (const auto* parent = current_routing ? current_routing->get_iface() : nullptr) zone->set_parent(parent); /* set properties */ - for (auto const& elm : cluster->properties) - zone->set_property(elm.first, elm.second); + for (auto const& [key, value] : cluster->properties) + zone->set_property(key, value); /* Make the backbone */ const simgrid::s4u::Link* backbone = nullptr; @@ -263,7 +254,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, cluster->bb_lat); - backbone = zone->create_link(bb_name, std::vector{cluster->bb_bw}) + backbone = zone->create_link(bb_name, cluster->bb_bw) ->set_sharing_policy(cluster->bb_sharing_policy) ->set_latency(cluster->bb_lat) ->seal(); @@ -288,7 +279,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA std::string loopback_name = link_id + "_loopback"; XBT_DEBUG("", loopback_name.c_str(), cluster->loopback_bw); - const auto* loopback = zone->create_link(loopback_name, std::vector{cluster->loopback_bw}) + const auto* loopback = zone->create_link(loopback_name, cluster->loopback_bw) ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) ->set_latency(cluster->loopback_lat) ->seal(); @@ -303,7 +294,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA std::string limiter_name = std::string(link_id) + "_limiter"; XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); - limiter = zone->create_link(limiter_name, std::vector{cluster->limiter_link})->seal(); + limiter = zone->create_link(limiter_name, cluster->limiter_link)->seal(); } // create link @@ -311,7 +302,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA if (cluster->sharing_policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { link = zone->create_split_duplex_link(link_id, cluster->bw)->set_latency(cluster->lat)->seal(); } else { - link = zone->create_link(link_id, std::vector{cluster->bw})->set_latency(cluster->lat)->seal(); + link = zone->create_link(link_id, cluster->bw)->set_latency(cluster->lat)->seal(); } /* adding routes */ @@ -333,7 +324,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 +347,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 +365,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()); @@ -393,12 +384,10 @@ static void sg_platf_build_cabinet(simgrid::kernel::routing::StarZone* zone, { 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 const* host = zone->create_host(id, {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(); + const auto* link_up = zone->create_link("link_" + id + "_UP", {args->bw})->set_latency(args->lat)->seal(); + const auto* link_down = zone->create_link("link_" + id + "_DOWN", {args->bw})->set_latency(args->lat)->seal(); sg_platf_cluster_set_hostlink(zone, host->get_netpoint(), link_up, link_down, backbone); } @@ -452,13 +441,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(); @@ -471,8 +461,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; @@ -483,39 +472,26 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); auto* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties, - auto_restart); + auto_restart, /*daemon=*/false, /*restart_count=*/0); host->get_impl()->add_actor_at_boot(arg); if (start_time > simgrid::s4u::Engine::get_clock()) { 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::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); - if (arg->kill_time >= 0) - new_actor->set_kill_time(arg->kill_time); - if (auto_restart) - new_actor->set_auto_restart(auto_restart); + auto_restart, /*daemon=*/false, /*restart_count=*/0); + + XBT_DEBUG("Actor %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); + simgrid::kernel::timer::Timer::set(start_time, [arg]() { + simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(arg); delete arg; }); } else { // start_time <= simgrid::s4u::Engine::get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); + XBT_DEBUG("Starting actor %s(%s) right now", arg->name.c_str(), host->get_cname()); try { - simgrid::kernel::actor::ActorImplPtr new_actor = 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); - if (auto_restart) - new_actor->set_auto_restart(auto_restart); + simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(arg); } catch (simgrid::HostFailureException const&) { - XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind."); + XBT_WARN("Starting actor %s(%s) failed because its host is turned off.", arg->name.c_str(), host->get_cname()); } } } @@ -523,7 +499,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 */ @@ -600,7 +576,6 @@ void sg_platf_new_zone_seal() zone_cluster.cabinets.clear(); zone_cluster.backbone.reset(); } - current_routing->seal(); current_routing = current_routing->get_parent(); } @@ -611,15 +586,15 @@ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* zone_cluster.host_links.emplace_back(*hostlink); } -void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args) +void sg_platf_new_trace(const simgrid::kernel::routing::ProfileCreationArgs* args) { simgrid::kernel::profile::Profile* profile; if (not args->file.empty()) { - profile = simgrid::kernel::profile::Profile::from_file(args->file); + profile = simgrid::kernel::profile::ProfileBuilder::from_file(args->file); } else { 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); + profile = simgrid::kernel::profile::ProfileBuilder::from_string(args->id, args->pc_data, args->periodicity); } - traces_set_list.insert({args->id, profile}); + traces_set_list.try_emplace(args->id, profile); }