X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf6a1d5f1eddea2b377415ab57c5185058488269..1e2a4672dd102fb81d2c2ffe1a93c973758a96bd:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 7b72b44ea9..a1498256a6 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,28 +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 "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 @@ -38,15 +39,11 @@ xbt::signal on_cluster_creation; } // namespace kernel } // namespace simgrid -simgrid::kernel::routing::ClusterZoneCreationArgs +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() -{ - return current_routing; -} static simgrid::s4u::Host* current_host = nullptr; /** Module management function: creates all internal data structures */ @@ -59,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(); } @@ -67,8 +63,7 @@ void sg_platf_exit() /** @brief Add a host to the current NetZone */ void sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* args) { - current_host = routing_get_current() - ->create_host(args->id, args->speed_per_pstate) + 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) @@ -100,7 +95,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) @@ -113,39 +108,33 @@ 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_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name) +void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args) { - routing_get_current() - ->create_link(link_name, args->bandwidths) - ->set_properties(args->properties) - ->get_impl() // this call to get_impl saves some simcalls but can be removed - ->set_sharing_policy(args->policy) + 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); + link->get_impl()->set_sharing_policy(args->policy, {}); + } + + 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) - ->seal(); -} + ->set_latency(args->latency); -void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link) -{ - if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { - sg_platf_new_link(link, link->id + "_UP"); - sg_platf_new_link(link, link->id + "_DOWN"); - } else { - sg_platf_new_link(link, link->id); - } + link->seal(); } void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) { - const simgrid::s4u::Disk* new_disk = routing_get_current() - ->create_disk(disk->id, disk->read_bw, disk->write_bw) + 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(); @@ -157,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()); @@ -176,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()); @@ -197,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); @@ -226,28 +217,26 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl set_limiter = std::bind(sg_platf_cluster_create_limiter, cluster, _1, _2, _3); } - simgrid::s4u::NetZone const* parent = routing_get_current() ? routing_get_current()->get_iface() : nullptr; - simgrid::s4u::NetZone* zone; + simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr; 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(); } /*************************************************************************************************/ @@ -255,7 +244,7 @@ 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 = routing_get_current() ? routing_get_current()->get_iface() : nullptr; + simgrid::s4u::NetZone const* parent = current_routing ? current_routing->get_iface() : nullptr; if (parent) zone->set_parent(parent); @@ -264,13 +253,13 @@ static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationA zone->set_property(elm.first, elm.second); /* Make the backbone */ - simgrid::s4u::Link* backbone = nullptr; + 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, 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(); @@ -295,44 +284,41 @@ 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); - 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(); + 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, - std::vector{loopback}); + {simgrid::s4u::LinkInRoute(loopback)}); } // add a limiter link (shared link to account for maximal bandwidth of the node) - simgrid::s4u::Link* limiter = nullptr; + 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, std::vector{cluster->limiter_link})->seal(); + limiter = zone->create_link(limiter_name, cluster->limiter_link)->seal(); } // create link - simgrid::s4u::Link* link_up; - simgrid::s4u::Link* link_down; + const simgrid::s4u::Link* link; 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(); + link = zone->create_split_duplex_link(link_id, 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; + link = zone->create_link(link_id, cluster->bw)->set_latency(cluster->lat)->seal(); } /* 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); + 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); } // Add a router. @@ -343,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); } @@ -363,29 +348,34 @@ void sg_platf_new_tag_cluster(simgrid::kernel::routing::ClusterCreationArgs* clu /*************************************************************************************************/ /** @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, simgrid::s4u::Link* link_up, - simgrid::s4u::Link* link_down, simgrid::kernel::resource::LinkImpl* backbone) + 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 %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) { - 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); + 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, {link_up->get_impl()}, false); - zone->add_route(nullptr, netpoint, nullptr, nullptr, {link_down->get_impl()}, false); + zone->add_route(netpoint, nullptr, nullptr, nullptr, {linkUp}, false); + zone->add_route(nullptr, netpoint, nullptr, nullptr, {linkDown}, false); } } /** @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) + 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()); - 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); + 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()); @@ -395,31 +385,29 @@ static void sg_platf_build_hostlink(simgrid::kernel::routing::StarZone* zone, /** @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) + const simgrid::s4u::Link* backbone) { 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(); - auto* link_up = - zone->create_link("link_" + id + "_UP", std::vector{args->bw})->set_latency(args->lat)->seal(); - 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); } } -void sg_platf_zone_cluster_populate(simgrid::kernel::routing::ClusterZoneCreationArgs* cluster) +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; + 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)->get_impl(); + backbone = simgrid::s4u::Link::by_name(cluster->backbone->id); } /* create host_links for hosts */ @@ -447,25 +435,25 @@ void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* a /*************************************************************************************************/ 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) { + 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(); @@ -478,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; @@ -490,39 +477,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 > SIMIX_get_clock()) { + 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::simix::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 <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); + } else { // start_time <= simgrid::s4u::Engine::get_clock() + 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()); } } } @@ -530,7 +504,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 */ @@ -538,51 +512,53 @@ static simgrid::kernel::routing::NetZoneImpl* sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone) { /* search the routing model */ - simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; + const simgrid::s4u::NetZone* new_zone = nullptr; if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { - new_zone = new simgrid::kernel::routing::StarZone(zone->id); + new_zone = simgrid::s4u::create_star_zone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { - new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false); + new_zone = simgrid::s4u::create_dijkstra_zone(zone->id, false); } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { - new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, true); + new_zone = simgrid::s4u::create_dijkstra_zone(zone->id, true); } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) { - new_zone = new simgrid::kernel::routing::FloydZone(zone->id); + new_zone = simgrid::s4u::create_floyd_zone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) { - new_zone = new simgrid::kernel::routing::FullZone(zone->id); + new_zone = simgrid::s4u::create_full_zone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "None") == 0) { - new_zone = new simgrid::kernel::routing::EmptyZone(zone->id); + new_zone = simgrid::s4u::create_empty_zone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) { - new_zone = new simgrid::kernel::routing::VivaldiZone(zone->id); + new_zone = simgrid::s4u::create_vivaldi_zone(zone->id); } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) { - new_zone = new simgrid::kernel::routing::WifiZone(zone->id); + new_zone = simgrid::s4u::create_wifi_zone(zone->id); } else { xbt_die("Not a valid model!"); } - new_zone->set_parent(current_routing); - return new_zone; + simgrid::kernel::routing::NetZoneImpl* new_zone_impl = new_zone->get_impl(); + new_zone_impl->set_parent(current_routing); + + return new_zone_impl; } /** * @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::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone) +simgrid::kernel::routing::NetZoneImpl* sg_platf_new_zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone) { zone_cluster.routing = zone->routing; - current_routing = sg_platf_create_zone(zone); + current_routing = sg_platf_create_zone(zone); return current_routing; } -void sg_platf_new_Zone_set_properties(const std::unordered_map& props) +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"); @@ -595,7 +571,7 @@ void sg_platf_new_Zone_set_properties(const std::unordered_mapseal(); current_routing = current_routing->get_parent(); } @@ -620,11 +595,11 @@ void sg_platf_new_trace(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}); }