X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c587485ee2aae6b2c54ed80656cbdc4e3ba8d157..b9d349f4e630752232d93f23b5cb3c33e02e0d05:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c4f452e26a..ef5eb05ac1 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. 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. */ @@ -15,6 +15,7 @@ #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" @@ -29,9 +30,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map mount_list; -XBT_PRIVATE std::vector known_storages; - namespace simgrid { namespace kernel { namespace routing { @@ -41,7 +39,6 @@ xbt::signal on_cluster_creation; } // namespace simgrid static int surf_parse_models_setup_already_called = 0; -std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -53,11 +50,12 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() { - simgrid::s4u::Engine::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() { +void sg_platf_exit() +{ simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); simgrid::s4u::Engine::on_platform_created.disconnect_slots(); @@ -67,34 +65,31 @@ void sg_platf_exit() { } /** @brief Add a host to the current AS */ -void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) +void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) { - std::map props; + simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount); + if (args->properties) { - for (auto const& elm : *args->properties) - props.insert({elm.first, elm.second}); + host->set_properties(*args->properties); delete args->properties; } - 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(); - - host->pimpl_->disks_ = std::move(args->disks); - for (auto d : host->pimpl_->disks_) - d->set_host(host); + host->pimpl_->set_disks(args->disks, host); /* Change from the defaults */ if (args->state_trace) host->set_state_profile(args->state_trace); if (args->speed_trace) host->set_speed_profile(args->speed_trace); - if (args->pstate != 0) - host->set_pstate(args->pstate); if (not args->coord.empty()) new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); + + simgrid::s4u::Host::on_creation(*host); // notify the signal + + /* 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 emition */ + if (args->pstate != 0) + host->set_pstate(args->pstate); } /** @brief Add a "router" to the network element list */ @@ -105,35 +100,37 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, 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()); - simgrid::kernel::routing::NetPoint* netpoint = - new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); + auto* netpoint = new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router); + netpoint->set_englobing_zone(current_routing); XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id()); if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - return netpoint; } -static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) +static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name) { - simgrid::kernel::resource::LinkImpl* l = - surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); - - if (link->properties) { - l->set_properties(*link->properties); - } + simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->policy); + if (args->policy != simgrid::s4u::Link::SharingPolicy::WIFI) + link->get_impl()->set_latency(args->latency); + + if (args->properties) + link->set_properties(*args->properties); + + simgrid::kernel::resource::LinkImpl* l = link->get_impl(); + if (args->latency_trace) + l->set_latency_profile(args->latency_trace); + if (args->bandwidth_trace) + l->set_bandwidth_profile(args->bandwidth_trace); + if (args->state_trace) + l->set_state_profile(args->state_trace); - if (link->latency_trace) - l->set_latency_profile(link->latency_trace); - if (link->bandwidth_trace) - l->set_bandwidth_profile(link->bandwidth_trace); - if (link->state_trace) - l->set_state_profile(link->state_trace); + link->seal(); } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +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"); @@ -151,40 +148,38 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster using simgrid::kernel::routing::FatTreeZone; using simgrid::kernel::routing::TorusZone; - int rankId=0; + int rankId = 0; // What an inventive way of initializing the AS that I have as ancestor :-( simgrid::kernel::routing::ZoneCreationArgs zone; zone.id = cluster->id; switch (cluster->topology) { case simgrid::kernel::routing::ClusterTopology::TORUS: - zone.routing = A_surfxml_AS_routing_ClusterTorus; + zone.routing = "ClusterTorus"; break; case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: - zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + zone.routing = "ClusterDragonfly"; break; case simgrid::kernel::routing::ClusterTopology::FAT_TREE: - zone.routing = A_surfxml_AS_routing_ClusterFatTree; + zone.routing = "ClusterFatTree"; break; default: - zone.routing = A_surfxml_AS_routing_Cluster; + zone.routing = "Cluster"; break; } sg_platf_new_Zone_begin(&zone); - simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); + auto* current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); if (cluster->properties != nullptr) for (auto const& elm : *cluster->properties) current_as->get_iface()->set_property(elm.first, elm.second); - if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ - current_as->num_links_per_node_++; - current_as->has_loopback_ = true; + if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) { + current_as->set_loopback(); } - if(cluster->limiter_link > 0){ - current_as->num_links_per_node_++; - current_as->has_limiter_ = true; + if (cluster->limiter_link > 0) { + current_as->set_limiter(); } for (int const& i : *cluster->radicals) { @@ -203,9 +198,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster } host.speed_per_pstate = cluster->speeds; - host.pstate = 0; - host.core_amount = cluster->core_amount; - host.coord = ""; + host.pstate = 0; + host.core_amount = cluster->core_amount; + host.coord = ""; sg_platf_new_host(&host); XBT_DEBUG(""); @@ -217,46 +212,46 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // 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){ + // add a loopback link + const simgrid::s4u::Link* linkUp = nullptr; + const 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.id = tmp_link; link.bandwidths.push_back(cluster->loopback_bw); - link.latency = cluster->loopback_lat; - link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; + 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()}}); + ClusterZone* as_cluster = current_as; + as_cluster->add_private_link_at(as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}); } - //add a limiter link (shared link to account for maximal bandwidth of the node) + // add a limiter link (shared link to account for maximal bandwidth of the node) linkUp = nullptr; linkDown = nullptr; - if(cluster->limiter_link > 0){ + 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.id = tmp_link; link.bandwidths.push_back(cluster->limiter_link); link.latency = 0; - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; + 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()}}); + current_as->add_private_link_at(current_as->node_pos_with_loopback(rankId), + {linkUp->get_impl(), linkDown->get_impl()}); } - //call the cluster function that adds the others links + // 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); } else { @@ -269,20 +264,17 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // 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; + current_as->set_router(sg_platf_new_router(cluster->router_id, nullptr)); - //Make the backbone + // 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.id = std::string(cluster->id) + "_backbone"; link.bandwidths.push_back(cluster->bb_bw); - link.latency = cluster->bb_lat; - link.policy = cluster->bb_sharing_policy; + 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); @@ -299,32 +291,31 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) { - simgrid::kernel::routing::ClusterZone* cluster = - dynamic_cast(current_routing); + auto* cluster = dynamic_cast(current_routing); 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()); + xbt_assert(not cluster->has_backbone(), "Cluster %s already has a backbone link!", cluster->get_cname()); - cluster->backbone_ = bb; + cluster->set_backbone(bb); XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); } -void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) +void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet) { 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; + host.pstate = 0; + host.core_amount = 1; + host.id = hostname; 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.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + link.latency = cabinet->lat; link.bandwidths.push_back(cabinet->bw); - link.id = "link_" + hostname; + link.id = "link_" + hostname; sg_platf_new_link(&link); simgrid::kernel::routing::HostLinkCreationArgs host_link; @@ -336,81 +327,19 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet delete cabinet->radicals; } -simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(simgrid::kernel::routing::DiskCreationArgs* disk) +simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) { - simgrid::kernel::resource::DiskImpl* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw); + simgrid::kernel::resource::DiskImpl* pimpl = + routing_get_current()->create_disk(disk->id, disk->read_bw, disk->write_bw)->get_impl(); + if (disk->properties) { - d->set_properties(*disk->properties); + pimpl->set_properties(*disk->properties); delete disk->properties; } - simgrid::s4u::Disk::on_creation(*d->get_iface()); - return d; -} - -void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage) -{ - 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::kernel::resource::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()); - } - - 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()); - } - - 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) { - s->set_properties(*storage->properties); - delete storage->properties; - } -} - -void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) -{ - 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::kernel::resource::StorageType* stype = new simgrid::kernel::resource::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; -} - -void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) -{ - 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()}); + pimpl->seal(); + simgrid::s4u::Disk::on_creation(*pimpl->get_iface()); + return pimpl; } void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) @@ -446,18 +375,19 @@ 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); + const simgrid::kernel::actor::ActorCodeFactory& factory = + simgrid::kernel::EngineImpl::get_instance()->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->restart_on_failure; - std::string actor_name = actor->args[0]; - simgrid::simix::ActorCode code = factory(std::move(actor->args)); + std::string actor_name = actor->args[0]; + simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); std::shared_ptr> properties(actor->properties); - simgrid::kernel::actor::ProcessArg* arg = + auto* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); host->pimpl_->add_actor_at_boot(arg); @@ -468,19 +398,19 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) 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(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); + arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) new_actor->set_kill_time(arg->kill_time); if (auto_restart) new_actor->set_auto_restart(auto_restart); delete arg; }); - } else { // start_time <= SIMIX_get_clock() + } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %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(), std::move(code), nullptr, host, + new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, arg->properties.get(), nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (arg->kill_time >= 0) @@ -493,14 +423,14 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } } -void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) +void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer) { - simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); + auto* as = dynamic_cast(current_routing); xbt_assert(as, " tag can only be used in Vivaldi netzones."); std::vector speed_per_pstate; speed_per_pstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1, nullptr); + simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1); as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); @@ -509,6 +439,7 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) host->set_state_profile(peer->state_trace); if (peer->speed_trace) host->set_speed_profile(peer->speed_trace); + simgrid::s4u::Host::on_creation(*host); // notify the signal } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -518,7 +449,6 @@ static void surf_config_models_setup() std::string network_model_name = simgrid::config::get_value("network/model"); std::string cpu_model_name = simgrid::config::get_value("cpu/model"); std::string disk_model_name = simgrid::config::get_value("disk/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")) && @@ -544,15 +474,73 @@ static void surf_config_models_setup() surf_host_model_description[host_id].model_init_preparse(); XBT_DEBUG("Call vm_model_init"); - surf_vm_model_init_HL13(); + /* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this + * requires changing the declaration of surf_cpu_model_description. + * To be reviewed in the future */ + surf_vm_model_init_HL13( + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get()); XBT_DEBUG("Call disk_model_init"); int disk_id = find_model_description(surf_disk_model_description, disk_model_name); surf_disk_model_description[disk_id].model_init_preparse(); +} - 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(); +/** + * @brief Auxiliary function to build the object NetZoneImpl + * + * Builds the objects, setting its father 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) +{ + /* search the routing model */ + simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; + + if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { + new_zone = new simgrid::kernel::routing::ClusterZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) { + new_zone = new simgrid::kernel::routing::DragonflyZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) { + new_zone = new simgrid::kernel::routing::TorusZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) { + new_zone = new simgrid::kernel::routing::FatTreeZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { + new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false); + } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { + new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, true); + } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) { + new_zone = new simgrid::kernel::routing::FloydZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) { + new_zone = new simgrid::kernel::routing::FullZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "None") == 0) { + new_zone = new simgrid::kernel::routing::EmptyZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) { + new_zone = new simgrid::kernel::routing::VivaldiZone(zone->id); + } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) { + new_zone = new simgrid::kernel::routing::WifiZone(zone->id); + } else { + xbt_die("Not a valid model!"); + } + new_zone->set_parent(current_routing); + + if (current_routing == nullptr) { /* it is the first one */ + simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface()); + } 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->add_child(new_zone); + /* set models from parent netzone */ + new_zone->set_network_model(current_routing->get_network_model()); + new_zone->set_cpu_pm_model(current_routing->get_cpu_pm_model()); + new_zone->set_cpu_vm_model(current_routing->get_cpu_vm_model()); + new_zone->set_disk_model(current_routing->get_disk_model()); + new_zone->set_host_model(current_routing->get_host_model()); + } + return new_zone; } /** @@ -565,8 +553,14 @@ static void surf_config_models_setup() * * @param zone the parameters defining the Zone to build. */ -simgrid::kernel::routing::NetZoneImpl* 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) { + /* First create the zone. + * This order is important to assure that root netzone is set when models are setting + * the default mode for each resource (CPU, network, etc) + */ + auto* new_zone = sg_platf_create_zone(zone); + if (not surf_parse_models_setup_already_called) { simgrid::s4u::Engine::on_platform_creation(); @@ -584,56 +578,6 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel:: _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; - simgrid::kernel::resource::NetworkModel* netmodel = - current_routing == nullptr ? surf_network_model : current_routing->network_model_; - switch (zone->routing) { - case A_surfxml_AS_routing_Cluster: - new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterDragonfly: - new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterTorus: - new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterFatTree: - new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Dijkstra: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false); - break; - case A_surfxml_AS_routing_DijkstraCache: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true); - break; - case A_surfxml_AS_routing_Floyd: - new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Full: - new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_None: - new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Vivaldi: - new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); - 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->get_iface()); - } 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->get_children()->push_back(new_zone); - } - /* set the new current component of the tree */ current_routing = new_zone; simgrid::s4u::NetZone::on_creation(*new_zone->get_iface()); // notify the signal @@ -641,7 +585,7 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel:: return new_zone; } -void sg_platf_new_Zone_set_properties(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"); @@ -650,40 +594,40 @@ void sg_platf_new_Zone_set_properties(std::unordered_mapseal(); simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); - current_routing = static_cast(current_routing->get_father()); + current_routing = current_routing->get_parent(); } -/** @brief Add a link connecting a 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 = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); + const 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(dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi ASes can get a host_link."); + "Only hosts from Cluster and Vivaldi Zones can get a 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); + 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); 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()) + if (as_cluster->private_link_exists_at(netpoint->id())) 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()}}); + as_cluster->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}); } void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile)