X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1b3e440de2150420b08c0bc55a125a0c9eb86bc..4463714490dc394b7b4703969003aaab6f805851:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 37e952b0a9..fbded0874a 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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/ClusterZone.hpp" #include "simgrid/kernel/routing/DijkstraZone.hpp" #include "simgrid/kernel/routing/DragonflyZone.hpp" @@ -14,11 +15,13 @@ #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 "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_host_private.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_private.hpp" @@ -27,18 +30,19 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map mount_list; +XBT_PRIVATE std::map mount_list; XBT_PRIVATE std::vector known_storages; namespace simgrid { -namespace surf { - -simgrid::xbt::signal on_cluster; -} -} +namespace kernel { +namespace routing { +xbt::signal on_cluster_creation; +} // namespace routing +} // namespace kernel +} // namespace simgrid static int surf_parse_models_setup_already_called = 0; -std::map storage_types; +std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -50,13 +54,13 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() { - simgrid::s4u::on_platform_created.connect(check_disk_attachment); + simgrid::s4u::Engine::on_platform_created.connect(check_disk_attachment); } /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_slots(); - simgrid::s4u::on_platform_created.disconnect_slots(); + 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; @@ -64,9 +68,9 @@ 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; + std::unordered_map props; if (args->properties) { for (auto const& elm : *args->properties) props.insert({elm.first, elm.second}); @@ -74,34 +78,34 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) } simgrid::s4u::Host* host = - routing_get_current()->create_host(args->id, &args->speed_per_pstate, args->core_amount, &props); + routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props); - host->pimpl_->storage_ = mount_list; + host->pimpl_->set_storages(mount_list); mount_list.clear(); + host->pimpl_->set_disks(args->disks, host); + /* Change from the defaults */ if (args->state_trace) - host->pimpl_cpu->set_state_profile(args->state_trace); + host->set_state_profile(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->set_speed_profile(args->speed_trace); + host->set_speed_profile(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); + host->set_pstate(args->pstate); + if (not args->coord.empty()) + new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const char* coords) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const char* coords) { - simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); - 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()); - simgrid::kernel::routing::NetPoint* netpoint = new simgrid::kernel::routing::NetPoint( - std::move(name), simgrid::kernel::routing::NetPoint::Type::Router, current_routing); + auto* netpoint = + new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id()); if (coords && strcmp(coords, "")) @@ -111,25 +115,26 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const 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->bandwidth, link->latency, link->policy); + std::unordered_map props; + if (args->properties) + for (auto const& elm : *args->properties) + props.insert({elm.first, elm.second}); - if (link->properties) { - for (auto const& elm : *link->properties) - l->set_property(elm.first, elm.second); - } + const simgrid::s4u::Link* link = + routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy, &props); - 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); + 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); } -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"); @@ -154,21 +159,24 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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_++; @@ -187,9 +195,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); simgrid::kernel::routing::HostCreationArgs host; - host.id = host_id.c_str(); + host.id = host_id; if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::unordered_map; + host.properties = new std::unordered_map(); for (auto const& elm : *cluster->properties) host.properties->insert({elm.first, elm.second}); @@ -211,22 +219,22 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // 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; + 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.bandwidth = cluster->loopback_bw; + link.bandwidths.push_back(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); + ClusterZone* as_cluster = current_as; as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } @@ -239,7 +247,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; - link.bandwidth = cluster->limiter_link; + link.bandwidths.push_back(cluster->limiter_link); link.latency = 0; link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); @@ -262,19 +270,15 @@ 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->router_ = sg_platf_new_router(cluster->router_id, 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.bandwidths.push_back(cluster->bb_bw); link.latency = cluster->bb_lat; link.policy = cluster->bb_sharing_policy; @@ -287,14 +291,13 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG(""); sg_platf_new_Zone_seal(); - simgrid::surf::on_cluster(cluster); + simgrid::kernel::routing::on_cluster_creation(*cluster); delete cluster->radicals; } 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()); @@ -303,21 +306,21 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* 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.c_str(); + 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.bandwidth = cabinet->bw; + link.bandwidths.push_back(cabinet->bw); link.id = "link_" + hostname; sg_platf_new_link(&link); @@ -330,12 +333,23 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet delete cabinet->radicals; } +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); + if (disk->properties) { + d->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::surf::StorageType* stype; + const simgrid::kernel::resource::StorageType* stype; auto st = storage_types.find(storage->type_id); if (st != storage_types.end()) { stype = st->second; @@ -361,23 +375,23 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage 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); + auto s = surf_storage_model->createStorage(storage->filename, storage->lineno, storage->id, stype->id, + storage->content, storage->attach); if (storage->properties) { - for (auto const& elm : *storage->properties) - s->set_property(elm.first, elm.second); + s->set_properties(*storage->properties); delete storage->properties; } } -void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) +void sg_platf_new_storage_type(const 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::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); + auto* 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()); @@ -419,8 +433,8 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::vector list = simgrid::s4u::Engine::get_instance()->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 @@ -430,68 +444,70 @@ 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->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; + bool auto_restart = actor->restart_on_failure; std::string actor_name = actor->args[0]; - simgrid::simix::ActorCode code = factory(std::move(actor->args)); + 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_->actors_at_boot_.emplace_back(arg); + host->pimpl_->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); 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]() { - simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( - arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); + 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, arg->properties.get(), nullptr); if (arg->kill_time >= 0) - actor->set_kill_time(arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - actor->set_auto_restart(auto_restart); + new_actor->set_auto_restart(auto_restart); delete arg; }); } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); - simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( - 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(), 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 (arg->kill_time >= 0) - actor->set_kill_time(arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - actor->set_auto_restart(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) +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 speedPerPstate; - speedPerPstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); + 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); - as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); + as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) - host->pimpl_cpu->set_state_profile(peer->state_trace); + host->set_state_profile(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->set_speed_profile(peer->speed_trace); + host->set_speed_profile(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -500,6 +516,7 @@ static void surf_config_models_setup() 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 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 */ @@ -528,6 +545,10 @@ static void surf_config_models_setup() XBT_DEBUG("Call vm_model_init"); surf_vm_model_init_HL13(); + 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(); @@ -543,10 +564,10 @@ 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) { if (not surf_parse_models_setup_already_called) { - simgrid::s4u::on_platform_creation(); + simgrid::s4u::Engine::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|zone|trace|trace_connect @@ -566,40 +587,30 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel:: 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: + if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterDragonfly: + } else if (strcasecmp(zone->routing.c_str(),"ClusterDragonfly") == 0) { new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterTorus: + } else if (strcasecmp(zone->routing.c_str(),"ClusterTorus") == 0) { new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_ClusterFatTree: + } else if (strcasecmp(zone->routing.c_str(),"ClusterFatTree") == 0) { new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Dijkstra: + } else if (strcasecmp(zone->routing.c_str(),"Dijkstra") == 0) { new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false); - break; - case A_surfxml_AS_routing_DijkstraCache: + } else if (strcasecmp(zone->routing.c_str(),"DijkstraCache") == 0) { new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true); - break; - case A_surfxml_AS_routing_Floyd: + } else if (strcasecmp(zone->routing.c_str(),"Floyd") == 0) { new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Full: + } else if (strcasecmp(zone->routing.c_str(),"Full") == 0) { new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_None: + } else if (strcasecmp(zone->routing.c_str(),"None") == 0) { new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel); - break; - case A_surfxml_AS_routing_Vivaldi: + } else if (strcasecmp(zone->routing.c_str(),"Vivaldi") == 0) { new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); - break; - default: - xbt_die("Not a valid model!"); - break; + } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) { + new_zone = new simgrid::kernel::routing::WifiZone(current_routing, zone->id, netmodel); + } else { + xbt_die("Not a valid model!"); } if (current_routing == nullptr) { /* it is the first one */ @@ -619,6 +630,14 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel:: return new_zone; } +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"); + + if (props) + current_routing->set_properties(*props); +} + /** * @brief Specify that the description of the current AS is finished * @@ -630,19 +649,19 @@ void sg_platf_new_Zone_seal() xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); - current_routing = static_cast(current_routing->get_father()); + current_routing = current_routing->get_father(); } /** @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) +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; + 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."); - 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());