X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f5cc4e090af49a98da0e25e9ee21a8ce6ce30f8..4c753f8d4cabd4104f3f7109823f16be2ebdcce3:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index d716fb8723..d78115a70c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -23,21 +23,17 @@ #include "src/kernel/resource/DiskImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/HostImpl.hpp" +#include "src/surf/xml/platf.hpp" #include "src/surf/xml/platf_private.hpp" -#include "surf/surf.hpp" #include #include 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(); } @@ -114,16 +109,6 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, 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; @@ -133,7 +118,13 @@ void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args) 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(); } @@ -158,7 +149,7 @@ sg_platf_cluster_create_host(const simgrid::kernel::routing::ClusterCreationArgs "(total = %zu). Check the 'radical' parameter in XML", cluster->id.c_str(), id, cluster->radicals.size()); - std::string host_id = std::string(cluster->prefix) + std::to_string(cluster->radicals[id]) + cluster->suffix; + std::string host_id = cluster->prefix + std::to_string(cluster->radicals[id]) + cluster->suffix; XBT_DEBUG("Cluster: creating host=%s speed=%f", host_id.c_str(), cluster->speeds.front()); const simgrid::s4u::Host* host = zone->create_host(host_id, cluster->speeds) ->set_core_count(cluster->core_amount) @@ -179,7 +170,7 @@ sg_platf_cluster_create_loopback(const simgrid::kernel::routing::ClusterCreation "(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]) + "_loopback"; + std::string link_id = cluster->id + "_link_" + std::to_string(cluster->radicals[id]) + "_loopback"; XBT_DEBUG("Cluster: creating loopback link=%s bw=%f", link_id.c_str(), cluster->loopback_bw); simgrid::s4u::Link* loopback = zone->create_link(link_id, cluster->loopback_bw) @@ -195,7 +186,7 @@ static simgrid::s4u::Link* sg_platf_cluster_create_limiter(const simgrid::kernel const std::vector& /*coord*/, unsigned long id) { - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(id) + "_limiter"; + std::string link_id = 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(); @@ -223,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(); } /*************************************************************************************************/ @@ -251,18 +240,17 @@ 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; if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - std::string bb_name = std::string(cluster->id) + "_backbone"; + std::string bb_name = cluster->id + "_backbone"; XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, cluster->bb_lat); @@ -273,7 +261,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA } for (int const& i : cluster->radicals) { - std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; + std::string host_id = cluster->prefix + std::to_string(i) + cluster->suffix; XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); const auto* host = zone->create_host(host_id, cluster->speeds) @@ -283,7 +271,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA XBT_DEBUG(""); - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); + std::string link_id = cluster->id + "_link_" + std::to_string(i); XBT_DEBUG("", link_id.c_str(), cluster->bw, cluster->lat); // add a loopback link @@ -303,7 +291,7 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA // add a limiter link (shared link to account for maximal bandwidth of the node) const simgrid::s4u::Link* limiter = nullptr; if (cluster->limiter_link > 0) { - std::string limiter_name = std::string(link_id) + "_limiter"; + std::string limiter_name = link_id + "_limiter"; XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); limiter = zone->create_link(limiter_name, cluster->limiter_link)->seal(); @@ -332,11 +320,10 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA 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; + cluster->router_id = cluster->prefix + cluster->id + "_router" + cluster->suffix; auto* router = zone->create_router(cluster->router_id); zone->add_route(router, nullptr, nullptr, nullptr, {}); - zone->seal(); simgrid::kernel::routing::on_cluster_creation(*cluster); } @@ -485,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()); } } } @@ -602,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(); } @@ -613,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); }