X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a0e2b82a1c0981a84e67f1bb4afb6e16fbf8c3a..2aaf66237295992a6fb4b0873b26075bd3a7f44a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index bf7afcc4c5..08386317d9 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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/kernel/routing/ClusterZone.hpp" +#include "simgrid/Exception.hpp" #include "simgrid/kernel/routing/DijkstraZone.hpp" #include "simgrid/kernel/routing/DragonflyZone.hpp" #include "simgrid/kernel/routing/EmptyZone.hpp" @@ -14,412 +14,455 @@ #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 "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_private.hpp" +#include "src/kernel/resource/DiskImpl.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf_private.hpp" +#include #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map mount_list; -XBT_PRIVATE std::vector known_storages; - namespace simgrid { -namespace surf { +namespace kernel { +namespace routing { +xbt::signal on_cluster_creation; +} // namespace routing +} // namespace kernel +} // namespace simgrid -simgrid::xbt::signal on_cluster; -} -} +static simgrid::kernel::routing::ClusterZoneCreationArgs + zone_cluster; /* temporary store data for irregular clusters, created with */ -static int surf_parse_models_setup_already_called = 0; -std::map storage_types; - -/** The current AS in the parsing */ +/** The current NetZone in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; -static simgrid::kernel::routing::NetZoneImpl* routing_get_current() -{ - return current_routing; -} +static simgrid::s4u::Host* current_host = nullptr; /** Module management function: creates all internal data structures */ void sg_platf_init() { - simgrid::s4u::on_platform_created.connect(check_disk_attachment); + // Do nothing: just for symmetry of user code } /** Module management function: frees all internal data structures */ -void sg_platf_exit() { - simgrid::surf::on_cluster.disconnectSlots(); - simgrid::s4u::on_platform_created.disconnectSlots(); +void sg_platf_exit() +{ + simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); + simgrid::s4u::Engine::on_platform_created.disconnect_slots(); - /* make sure that we will reinit the models while loading the platf once reinited */ - surf_parse_models_setup_already_called = 0; surf_parse_lex_destroy(); } -/** @brief Add an host to the current AS */ -void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) +/** @brief Add a host to the current NetZone */ +void sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* args) { - std::map props; - if (args->properties) { - for (auto const& elm : *args->properties) - props.insert({elm.first, elm.second}); - delete args->properties; - } + current_host = current_routing->create_host(args->id, args->speed_per_pstate) + ->set_coordinates(args->coord) + ->set_core_count(args->core_amount) + ->set_state_profile(args->state_trace) + ->set_speed_profile(args->speed_trace); +} - simgrid::s4u::Host* host = - routing_get_current()->create_host(args->id, &args->speed_per_pstate, args->core_amount, &props); - - host->pimpl_->storage_ = mount_list; - mount_list.clear(); - - /* Change from the defaults */ - if (args->state_trace) - host->pimpl_cpu->set_state_trace(args->state_trace); - if (args->speed_trace) - host->pimpl_cpu->set_speed_trace(args->speed_trace); - if (args->pstate != 0) - host->pimpl_cpu->set_pstate(args->pstate); - if (args->coord && strcmp(args->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); +void sg_platf_new_host_set_properties(const std::unordered_map& props) +{ + xbt_assert(current_host, "Cannot set properties of the current host: none under construction"); + current_host->set_properties(props); } -/** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const char* coords) +void sg_platf_new_host_seal(int pstate) { - simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); + xbt_assert(current_host, "Cannot seal the current Host: none under construction"); + current_host->seal(); - if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; - xbt_assert(nullptr == simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name), - "Refusing to create a router named '%s': this name already describes a node.", name.c_str()); + /* When energy plugin is activated, changing the pstate requires to already have the HostEnergy extension whose + * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emission */ - simgrid::kernel::routing::NetPoint* netpoint = - new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); - XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id()); + if (pstate != 0) + current_host->set_pstate(pstate); + + current_host = nullptr; +} - if (coords && strcmp(coords, "")) - new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); +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, {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) +{ + auto* netpoint = current_routing->create_router(name)->set_coordinates(coords); + XBT_DEBUG("Router '%s' has the id %lu", netpoint->get_cname(), netpoint->id()); return netpoint; } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +static void sg_platf_set_link_properties(simgrid::s4u::Link* link, + const simgrid::kernel::routing::LinkCreationArgs* args) { - std::vector names; + 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); +} - if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { - names.push_back(link->id+ "_UP"); - names.push_back(link->id+ "_DOWN"); +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 { - names.push_back(link->id); + link = current_routing->create_link(args->id, args->bandwidths); + link->get_impl()->set_sharing_policy(args->policy, {}); } - for (auto const& link_name : names) { - simgrid::kernel::resource::LinkImpl* l = - surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + sg_platf_set_link_properties(link, args); + link->seal(); +} - if (link->properties) { - for (auto const& elm : *link->properties) - l->set_property(elm.first, elm.second); - } +void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) +{ + const simgrid::s4u::Disk* new_disk = current_routing->create_disk(disk->id, disk->read_bw, disk->write_bw) + ->set_host(current_host) + ->set_properties(disk->properties) + ->seal(); - if (link->latency_trace) - l->set_latency_trace(link->latency_trace); - if (link->bandwidth_trace) - l->set_bandwidth_trace(link->bandwidth_trace); - if (link->state_trace) - l->set_state_trace(link->state_trace); - } - delete link->properties; + 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, + const std::vector& /*coord*/, unsigned long id) +{ + xbt_assert(static_cast(id) < cluster->radicals.size(), + "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()); + + std::string host_id = std::string(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) + ->set_properties(cluster->properties) + ->seal(); + return std::make_pair(host->get_netpoint(), nullptr); +} + +/** @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*/, + unsigned long id) +{ + xbt_assert(static_cast(id) < cluster->radicals.size(), + "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()); + + std::string link_id = std::string(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) + ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE) + ->set_latency(cluster->loopback_lat) + ->seal(); + return loopback; +} + +/** @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*/, + 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); + + simgrid::s4u::Link* limiter = zone->create_link(link_id, cluster->limiter_link)->seal(); + return limiter; } -void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) +/** @brief Create Torus, Fat-Tree and Dragonfly clusters */ +static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::ClusterCreationArgs* cluster) { - using simgrid::kernel::routing::ClusterZone; + using namespace std::placeholders; using simgrid::kernel::routing::DragonflyZone; using simgrid::kernel::routing::FatTreeZone; using simgrid::kernel::routing::TorusZone; - int rankId=0; + auto set_host = std::bind(sg_platf_cluster_create_host, cluster, _1, _2, _3); + std::function set_loopback{}; + std::function set_limiter{}; - // What an inventive way of initializing the AS that I have as ancestor :-( - simgrid::kernel::routing::ZoneCreationArgs zone; - zone.id = cluster->id; + if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { + set_loopback = std::bind(sg_platf_cluster_create_loopback, cluster, _1, _2, _3); + } + + if (cluster->limiter_link > 0) { + set_limiter = std::bind(sg_platf_cluster_create_limiter, cluster, _1, _2, _3); + } + + 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.routing = A_surfxml_AS_routing_ClusterTorus; + 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); break; case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: - zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + 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.routing = A_surfxml_AS_routing_ClusterFatTree; + 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: - zone.routing = A_surfxml_AS_routing_Cluster; - break; + THROW_IMPOSSIBLE; } - sg_platf_new_Zone_begin(&zone); - simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); - current_as->parse_specific_arguments(cluster); + zone->seal(); +} - if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ - current_as->num_links_per_node_++; - current_as->has_loopback_ = true; - } +/*************************************************************************************************/ +/** @brief Create regular Cluster */ +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) + zone->set_parent(parent); + + /* set properties */ + for (auto const& elm : cluster->properties) + zone->set_property(elm.first, elm.second); - if(cluster->limiter_link > 0){ - current_as->num_links_per_node_++; - current_as->has_limiter_ = true; + /* 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"; + XBT_DEBUG(" ", bb_name.c_str(), cluster->bb_bw, + cluster->bb_lat); + + backbone = zone->create_link(bb_name, cluster->bb_bw) + ->set_sharing_policy(cluster->bb_sharing_policy) + ->set_latency(cluster->bb_lat) + ->seal(); } - for (int const& i : *cluster->radicals) { + for (int const& i : cluster->radicals) { std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; - std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); - - XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); - simgrid::kernel::routing::HostCreationArgs host; - host.id = host_id.c_str(); - if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::unordered_map; - - for (auto const& elm : *cluster->properties) - host.properties->insert({elm.first, elm.second}); - } + XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); + const auto* host = zone->create_host(host_id, cluster->speeds) + ->set_core_count(cluster->core_amount) + ->set_properties(cluster->properties) + ->seal(); - host.speed_per_pstate = cluster->speeds; - host.pstate = 0; - host.core_amount = cluster->core_amount; - host.coord = ""; - sg_platf_new_host(&host); 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::s4u::Link* linkUp = nullptr; - simgrid::s4u::Link* linkDown = nullptr; - if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ - std::string tmp_link = link_id + "_loopback"; - XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); - - simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; - link.bandwidth = cluster->loopback_bw; - link.latency = cluster->loopback_lat; - link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; - sg_platf_new_link(&link); - linkUp = simgrid::s4u::Link::by_name_or_null(tmp_link); - linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); - - auto* as_cluster = static_cast(current_as); - as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); + // add a loopback link + 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); + + 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(); + + zone->add_route(host->get_netpoint(), host->get_netpoint(), nullptr, nullptr, + {simgrid::s4u::LinkInRoute(loopback)}); } - //add a limiter link (shared link to account for maximal bandwidth of the node) - linkUp = nullptr; - linkDown = nullptr; - if(cluster->limiter_link > 0){ - std::string tmp_link = std::string(link_id) + "_limiter"; - XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - - simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; - link.bandwidth = cluster->limiter_link; - link.latency = 0; - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; - sg_platf_new_link(&link); - linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); - linkUp = linkDown; - current_as->private_links_.insert( - {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); + // 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"; + XBT_DEBUG("", limiter_name.c_str(), cluster->limiter_link); + + limiter = zone->create_link(limiter_name, cluster->limiter_link)->seal(); } - //call the cluster function that adds the others links - if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) { - static_cast(current_as)->add_processing_node(i); + // create link + const simgrid::s4u::Link* link; + 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 { - current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId)); + link = zone->create_link(link_id, cluster->bw)->set_latency(cluster->lat)->seal(); } - rankId++; + + /* adding routes */ + std::vector links; + if (limiter) + links.emplace_back(limiter); + links.emplace_back(link, simgrid::s4u::LinkInRoute::Direction::UP); + if (backbone) + links.emplace_back(backbone); + + zone->add_route(host->get_netpoint(), nullptr, nullptr, nullptr, links, true); } - delete cluster->properties; // Add a router. XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id.c_str()); - if (cluster->router_id.empty()) { - std::string newid = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; - current_as->router_ = sg_platf_new_router(newid, NULL); - } else { - current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); - } + if (cluster->router_id.empty()) + cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; + 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)) { - - simgrid::kernel::routing::LinkCreationArgs link; - link.id = std::string(cluster->id)+ "_backbone"; - link.bandwidth = cluster->bb_bw; - link.latency = cluster->bb_lat; - link.policy = cluster->bb_sharing_policy; - - XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); - sg_platf_new_link(&link); + zone->seal(); + simgrid::kernel::routing::on_cluster_creation(*cluster); +} - routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); +void sg_platf_new_tag_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) +{ + switch (cluster->topology) { + case simgrid::kernel::routing::ClusterTopology::TORUS: + case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: + case simgrid::kernel::routing::ClusterTopology::FAT_TREE: + sg_platf_new_cluster_hierarchical(cluster); + break; + default: + sg_platf_new_cluster_flat(cluster); + break; + } +} +/*************************************************************************************************/ +/** @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, + const simgrid::s4u::Link* backbone) +{ + 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) { + simgrid::s4u::LinkInRoute linkBB{backbone}; + zone->add_route(netpoint, nullptr, nullptr, nullptr, {linkUp, linkBB}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {linkBB, linkDown}, false); + } else { + zone->add_route(netpoint, nullptr, nullptr, nullptr, {linkUp}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {linkDown}, false); } - - XBT_DEBUG(""); - sg_platf_new_Zone_seal(); - - simgrid::surf::on_cluster(cluster); - delete cluster->radicals; } -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, + const simgrid::s4u::Link* backbone) { - simgrid::kernel::routing::ClusterZone* 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(nullptr == cluster->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->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%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(simgrid::kernel::routing::CabinetCreationArgs* cabinet) +/** @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, + const simgrid::s4u::Link* backbone) { - for (int const& radical : *cabinet->radicals) { - std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; - simgrid::kernel::routing::HostCreationArgs host; - host.pstate = 0; - host.core_amount = 1; - host.id = hostname.c_str(); - host.speed_per_pstate.push_back(cabinet->speed); - sg_platf_new_host(&host); - - simgrid::kernel::routing::LinkCreationArgs link; - link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; - link.latency = cabinet->lat; - link.bandwidth = cabinet->bw; - link.id = "link_" + hostname; - sg_platf_new_link(&link); - - simgrid::kernel::routing::HostLinkCreationArgs host_link; - host_link.id = hostname; - host_link.link_up = std::string("link_") + hostname + "_UP"; - host_link.link_down = std::string("link_") + hostname + "_DOWN"; - sg_platf_new_hostlink(&host_link); + for (int const& radical : args->radicals) { + std::string id = args->prefix + std::to_string(radical) + args->suffix; + auto const* host = zone->create_host(id, {args->speed})->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); } - delete cabinet->radicals; } -void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage) +static void sg_platf_zone_cluster_populate(const simgrid::kernel::routing::ClusterZoneCreationArgs* cluster) { - xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(), - "Refusing to add a second storage named \"%s\"", storage->id.c_str()); - - simgrid::surf::StorageType* stype; - auto st = storage_types.find(storage->type_id); - if (st != storage_types.end()) { - stype = st->second; - } else { - xbt_die("No storage type '%s'", storage->type_id.c_str()); + auto* zone = dynamic_cast(current_routing); + xbt_assert(zone, "Host_links are only valid for Cluster(Star)"); + + const simgrid::s4u::Link* backbone = nullptr; + /* create backbone */ + if (cluster->backbone) { + sg_platf_new_link(cluster->backbone.get()); + backbone = simgrid::s4u::Link::by_name(cluster->backbone->id); } - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id.c_str(), - storage->type_id.c_str(), storage->content.c_str()); - - known_storages.push_back(storage->id); - - // if storage content is not specified use the content of storage_type if any - if (storage->content.empty() && not stype->content.empty()) { - storage->content = stype->content; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(), - stype->id.c_str()); + /* create host_links for hosts */ + for (auto const& hostlink : cluster->host_links) { + sg_platf_build_hostlink(zone, &hostlink, backbone); } - XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " - "\n\t\tmodel '%s' \n\t\tcontent '%s' " - "\n\t\tproperties '%p''\n", - storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(), - storage->properties); - - auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); - - if (storage->properties) { - for (auto const& elm : *storage->properties) - s->set_property(elm.first, elm.second); - delete storage->properties; + /* create cabinets */ + for (auto const& cabinet : cluster->cabinets) { + sg_platf_build_cabinet(zone, &cabinet, backbone); } } -void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) +void routing_cluster_add_backbone(std::unique_ptr link) { - xbt_assert(storage_types.find(storage_type->id) == storage_types.end(), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str()); - - simgrid::surf::StorageType* stype = - new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content, - storage_type->properties, storage_type->model_properties, storage_type->size); - - XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(), - storage_type->model.c_str(), storage_type->content.c_str()); - - storage_types[storage_type->id] = stype; + zone_cluster.backbone = std::move(link); } -void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) +void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args) { - xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(), - "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str()); - - XBT_DEBUG("Mount '%s' on '%s'", mount->storageId.c_str(), mount->name.c_str()); - - if (mount_list.empty()) - XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->get_impl()}); + 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, - route->symmetrical); + current_routing->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, + route->symmetrical); } -void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassRoute) +void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* route) { - routing_get_current()->add_bypass_route(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, - bypassRoute->link_list, bypassRoute->symmetrical); + current_routing->add_bypass_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list); } void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) { + 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& host : list) { - msg += host->get_name(); + for (auto const& some_host : list) { + msg += some_host->get_name(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -429,239 +472,154 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); - xbt_assert(factory, "Function '%s' unknown", 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; double kill_time = actor->kill_time; - bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; + bool auto_restart = actor->restart_on_failure; - std::string actor_name = actor->args[0]; - std::function code = factory(std::move(actor->args)); - std::shared_ptr> properties(actor->properties); + std::string actor_name = actor->args[0]; + simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); - simgrid::kernel::actor::ProcessArg* arg = - new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); + auto* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, actor->properties, + auto_restart); - host->extension()->boot_processes.push_back(arg); + host->get_impl()->add_actor_at_boot(arg); - if (start_time > SIMIX_get_clock()) { - - arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); + 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); - SIMIX_timer_set(start_time, [arg, auto_restart]() { - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, - arg->host, arg->properties.get(), nullptr); + 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) - simcall_process_set_kill_time(actor, arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - SIMIX_process_auto_restart_set(actor, auto_restart); + new_actor->set_auto_restart(auto_restart); delete arg; }); - } else { // start_time <= SIMIX_get_clock() + } else { // start_time <= simgrid::s4u::Engine::get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - arg->properties.get(), nullptr); - - /* The actor creation will fail if the host is currently dead, but that's fine */ - if (actor != nullptr) { + 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) - simcall_process_set_kill_time(actor, arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - SIMIX_process_auto_restart_set(actor, auto_restart); + new_actor->set_auto_restart(auto_restart); + } catch (simgrid::HostFailureException const&) { + XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind."); } } } -void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) -{ - simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); - xbt_assert(as, " tag can only be used in Vivaldi netzones."); - - std::vector speedPerPstate; - speedPerPstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); - - as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); - - /* Change from the defaults */ - if (peer->state_trace) - host->pimpl_cpu->set_state_trace(peer->state_trace); - if (peer->speed_trace) - host->pimpl_cpu->set_speed_trace(peer->speed_trace); -} - -/* Pick the right models for CPU, net and host, and call their model_init_preparse */ -static void surf_config_models_setup() +/** + * @brief Auxiliary function to build the object NetZoneImpl + * + * 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 + */ +static simgrid::kernel::routing::NetZoneImpl* +sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) { - std::string host_model_name = simgrid::config::get_value("host/model"); - std::string network_model_name = simgrid::config::get_value("network/model"); - std::string cpu_model_name = simgrid::config::get_value("cpu/model"); - std::string storage_model_name = simgrid::config::get_value("storage/model"); - - /* The compound host model is needed when using non-default net/cpu models */ - if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && - simgrid::config::is_default("host/model")) { - host_model_name = "compound"; - simgrid::config::set_value("host/model", host_model_name); - } - - XBT_DEBUG("host model: %s", host_model_name.c_str()); - if (host_model_name == "compound") { - xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); - xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model"); - - int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); - surf_cpu_model_description[cpu_id].model_init_preparse(); - - int network_id = find_model_description(surf_network_model_description, network_model_name); - surf_network_model_description[network_id].model_init_preparse(); + /* search the routing model */ + const simgrid::s4u::NetZone* new_zone = nullptr; + + if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { + new_zone = simgrid::s4u::create_star_zone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { + new_zone = simgrid::s4u::create_dijkstra_zone(zone->id, false); + } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { + new_zone = simgrid::s4u::create_dijkstra_zone(zone->id, true); + } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) { + new_zone = simgrid::s4u::create_floyd_zone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) { + new_zone = simgrid::s4u::create_full_zone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "None") == 0) { + new_zone = simgrid::s4u::create_empty_zone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) { + new_zone = simgrid::s4u::create_vivaldi_zone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) { + new_zone = simgrid::s4u::create_wifi_zone(zone->id); + } else { + xbt_die("Not a valid model!"); } - XBT_DEBUG("Call host_model_init"); - int host_id = find_model_description(surf_host_model_description, host_model_name); - surf_host_model_description[host_id].model_init_preparse(); + simgrid::kernel::routing::NetZoneImpl* new_zone_impl = new_zone->get_impl(); + new_zone_impl->set_parent(current_routing); - XBT_DEBUG("Call vm_model_init"); - surf_vm_model_init_HL13(); - - XBT_DEBUG("Call storage_model_init"); - int storage_id = find_model_description(surf_storage_model_description, storage_model_name); - surf_storage_model_description[storage_id].model_init_preparse(); + return new_zone_impl; } /** - * \brief Add a Zone to the platform + * @brief Add a Zone to the platform * * Add a new autonomous system to the platform. Any elements (such as host, router or sub-Zone) added after this call - * and before the corresponding call to sg_platf_new_Zone_seal() will be added to this Zone. + * and before the corresponding call to sg_platf_new_zone_seal() will be added to this Zone. * * Once this function was called, the configuration concerning the used models cannot be changed anymore. * * @param zone the parameters defining the Zone to build. */ -simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) +simgrid::kernel::routing::NetZoneImpl* sg_platf_new_zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone) { - if (not surf_parse_models_setup_already_called) { - simgrid::s4u::on_platform_creation(); - - /* Initialize the surf models. That must be done after we got all config, and before we need the models. - * That is, after the last tag, if any, and before the first of cluster|peer|AS|trace|trace_connect - * - * I'm not sure for and , there may be a bug here - * (FIXME: check it out by creating a file beginning with one of these tags) - * but cluster and peer create ASes internally, so putting the code in there is ok. - */ - surf_parse_models_setup_already_called = 1; - surf_config_models_setup(); - } + zone_cluster.routing = zone->routing; + current_routing = sg_platf_create_zone(zone); - _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent - * any further config now that we created some real content */ - - /* search the routing model */ - simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; - switch (zone->routing) { - case A_surfxml_AS_routing_Cluster: - new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_ClusterDragonfly: - new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_ClusterTorus: - new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_ClusterFatTree: - new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_Dijkstra: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, false); - break; - case A_surfxml_AS_routing_DijkstraCache: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, true); - break; - case A_surfxml_AS_routing_Floyd: - new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_Full: - new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_None: - new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id); - break; - case A_surfxml_AS_routing_Vivaldi: - new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id); - break; - default: - xbt_die("Not a valid model!"); - break; - } - - if (current_routing == nullptr) { /* it is the first one */ - simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone); - } else { - /* set the father behavior */ - if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; - /* add to the sons dictionary */ - current_routing->getChildren()->push_back(static_cast(new_zone)); - } + return current_routing; +} - /* set the new current component of the tree */ - current_routing = new_zone; - simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal +void sg_platf_new_zone_set_properties(const std::unordered_map& props) +{ + xbt_assert(current_routing, "Cannot set properties of the current Zone: none under construction"); - return new_zone; + current_routing->set_properties(props); } /** - * \brief Specify that the description of the current AS is finished + * @brief Specify that the description of the current Zone is finished * - * Once you've declared all the content of your AS, you have to seal - * it with this call. Your AS is not usable until you call this function. + * Once you've declared all the content of your Zone, you have to seal + * it with this call. Your Zone is not usable until you call this function. */ -void sg_platf_new_Zone_seal() +void sg_platf_new_zone_seal() { - xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); + xbt_assert(current_routing, "Cannot seal the current Zone: none under construction"); + if (strcasecmp(zone_cluster.routing.c_str(), "Cluster") == 0) { + sg_platf_zone_cluster_populate(&zone_cluster); + zone_cluster.routing = ""; + zone_cluster.host_links.clear(); + zone_cluster.cabinets.clear(); + zone_cluster.backbone.reset(); + } current_routing->seal(); - simgrid::s4u::NetZone::on_seal(*current_routing); - current_routing = static_cast(current_routing->get_father()); + current_routing = current_routing->get_parent(); } -/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ -void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink) +/** @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) { - simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint; - xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); - xbt_assert(dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - - simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); - 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* as_cluster = static_cast(current_routing); - - if (as_cluster->private_links_.find(netpoint->id()) != as_cluster->private_links_.end()) - 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()); - as_cluster->private_links_.insert({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::TraceCreationArgs* trace) +void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args) { - tmgr_trace_t tmgr_trace; - if (not trace->file.empty()) { - tmgr_trace = tmgr_trace_new_from_file(trace->file); + simgrid::kernel::profile::Profile* profile; + if (not args->file.empty()) { + profile = simgrid::kernel::profile::Profile::from_file(args->file); } else { - xbt_assert(not trace->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", - trace->id.c_str()); - tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->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({trace->id, tmgr_trace}); + traces_set_list.insert({args->id, profile}); }