X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85e1d2c205ca99512b48bceca0f16677a401e233..39cfe4998b59626bdcc96dc00d3bf029825a10a5:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index dc6fee2084..4201ba0b49 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,8 +1,9 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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" @@ -15,31 +16,30 @@ #include "simgrid/kernel/routing/TorusZone.hpp" #include "simgrid/kernel/routing/VivaldiZone.hpp" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Storage.hpp" #include "src/include/simgrid/sg_config.hpp" +#include "src/include/surf/surf.hpp" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" #include 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; +simgrid::xbt::signal on_cluster; } } 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,20 +50,21 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() -{ /* Do nothing: just for symmetry of user code */ +{ + simgrid::s4u::on_platform_created.connect(check_disk_attachment); } /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnectSlots(); - simgrid::s4u::onPlatformCreated.disconnectSlots(); + simgrid::surf::on_cluster.disconnect_slots(); + simgrid::s4u::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 */ +/** @brief Add a host to the current AS */ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) { std::map props; @@ -74,35 +75,33 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) } simgrid::s4u::Host* host = - routing_get_current()->createHost(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; mount_list.clear(); /* Change from the defaults */ if (args->state_trace) - host->pimpl_cpu->setStateTrace(args->state_trace); + host->pimpl_cpu->set_state_profile(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->set_speed_trace(args->speed_trace); + host->pimpl_cpu->set_speed_profile(args->speed_trace); if (args->pstate != 0) - host->pimpl_cpu->setPState(args->pstate); - if (args->coord && strcmp(args->coord, "")) + host->pimpl_cpu->set_pstate(args->pstate); + if (not args->coord.empty()) new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_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::getInstance()->getNetpointByNameOrNull(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); - XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id()); + 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); @@ -111,31 +110,30 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const return netpoint; } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) { - std::vector names; + simgrid::kernel::resource::LinkImpl* l = + surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); - if (link->policy == SURF_LINK_SPLITDUPLEX) { - names.push_back(link->id+ "_UP"); - names.push_back(link->id+ "_DOWN"); - } else { - names.push_back(link->id); + if (link->properties) { + l->set_properties(*link->properties); } - for (auto const& link_name : names) { - simgrid::surf::LinkImpl* l = - surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); - if (link->properties) { - for (auto const& elm : *link->properties) - l->setProperty(elm.first, elm.second); - } + 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); +} - if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); - if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); - if (link->state_trace) - l->setStateTrace(link->state_trace); +void sg_platf_new_link(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); } delete link->properties; } @@ -169,6 +167,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster sg_platf_new_Zone_begin(&zone); simgrid::kernel::routing::ClusterZone* 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_++; @@ -189,7 +190,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster simgrid::kernel::routing::HostCreationArgs host; host.id = host_id.c_str(); if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::map; + host.properties = new std::unordered_map; for (auto const& elm : *cluster->properties) host.properties->insert({elm.first, elm.second}); @@ -211,23 +212,23 @@ 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::surf::LinkImpl* linkUp = nullptr; - simgrid::surf::LinkImpl* linkDown = nullptr; + 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.bandwidths.push_back(cluster->loopback_bw); link.latency = cluster->loopback_lat; - link.policy = SURF_LINK_FATPIPE; + link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; sg_platf_new_link(&link); - linkUp = simgrid::surf::LinkImpl::byName(tmp_link); - linkDown = simgrid::surf::LinkImpl::byName(tmp_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->nodePosition(rankId), {linkUp, linkDown}}); + as_cluster->private_links_.insert({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) @@ -239,20 +240,21 @@ 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 = SURF_LINK_SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); linkUp = linkDown; - current_as->private_links_.insert({current_as->nodePositionWithLoopback(rankId), {linkUp, linkDown}}); + current_as->private_links_.insert( + {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } //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 { - current_as->create_links_for_node(cluster, i, rankId, current_as->nodePositionWithLimiter(rankId)); + current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId)); } rankId++; } @@ -273,33 +275,33 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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; XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); } XBT_DEBUG(""); sg_platf_new_Zone_seal(); - simgrid::surf::on_cluster(cluster); + simgrid::surf::on_cluster(*cluster); delete cluster->radicals; } -void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) +void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) { simgrid::kernel::routing::ClusterZone* 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->getCname()); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->get_cname()); cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->getCname()); + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); } void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) @@ -314,9 +316,9 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet sg_platf_new_host(&host); simgrid::kernel::routing::LinkCreationArgs link; - link.policy = SURF_LINK_SPLITDUPLEX; + 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); @@ -334,7 +336,7 @@ 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; + simgrid::kernel::resource::StorageType* stype; auto st = storage_types.find(storage->type_id); if (st != storage_types.end()) { stype = st->second; @@ -363,8 +365,7 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); if (storage->properties) { - for (auto const& elm : *storage->properties) - s->setProperty(elm.first, elm.second); + s->set_properties(*storage->properties); delete storage->properties; } } @@ -374,9 +375,9 @@ void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs 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); + 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()); @@ -393,19 +394,19 @@ void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::s4u::Engine::getInstance()->storageByName(mount->storageId)->getImpl()}); + mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->get_impl()}); } void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { - routing_get_current()->addRoute(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, - route->symmetrical); + routing_get_current()->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) { - routing_get_current()->addBypassRoute(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, - bypassRoute->link_list, bypassRoute->symmetrical); + routing_get_current()->add_bypass_route(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, + bypassRoute->link_list, bypassRoute->symmetrical); } void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) @@ -416,10 +417,10 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - std::vector list = simgrid::s4u::Engine::getInstance()->getAllHosts(); + std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - for (auto const& host : list) { - msg += host->getName(); + for (auto const& some_host : list) { + msg += some_host->get_name(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -430,47 +431,49 @@ 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); + 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; std::string actor_name = actor->args[0]; - std::function code = factory(std::move(actor->args)); - std::shared_ptr> properties(actor->properties); + simgrid::simix::ActorCode code = factory(std::move(actor->args)); + std::shared_ptr> properties(actor->properties); simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); - host->extension()->boot_processes.push_back(arg); + host->pimpl_->actors_at_boot_.emplace_back(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->getCname(), 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); + 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); 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() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); - - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - arg->properties.get(), nullptr); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); - /* 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) - 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."); } } } @@ -480,38 +483,32 @@ 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->createHost(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.c_str(), speed_per_pstate, 1, nullptr); - as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); + as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) - host->pimpl_cpu->setStateTrace(peer->state_trace); + host->pimpl_cpu->set_state_profile(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->set_speed_trace(peer->speed_trace); -} - -void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } - -void sg_platf_end() { - simgrid::s4u::onPlatformCreated(); + host->pimpl_cpu->set_speed_profile(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - std::string host_model_name = xbt_cfg_get_string("host/model"); - std::string network_model_name = xbt_cfg_get_string("network/model"); - std::string cpu_model_name = xbt_cfg_get_string("cpu/model"); - std::string storage_model_name = xbt_cfg_get_string("storage/model"); + 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 xbt_cfg_is_default_value("network/model") || not xbt_cfg_is_default_value("cpu/model")) && - xbt_cfg_is_default_value("host/model")) { + 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"; - xbt_cfg_set_string("host/model", host_model_name.c_str()); + simgrid::config::set_value("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name.c_str()); @@ -539,7 +536,7 @@ static void surf_config_models_setup() } /** - * \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. @@ -548,15 +545,17 @@ static void surf_config_models_setup() * * @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(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 + * That is, after the last tag, if any, and before the first of cluster|peer|zone|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. + * but cluster and peer come down to zone creations, so putting this verification here is correct. */ surf_parse_models_setup_already_called = 1; surf_config_models_setup(); @@ -567,36 +566,38 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre /* 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); + 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); + 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); + 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); + 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, false); + 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, true); + 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); + 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); + 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); + 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); + new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); break; default: xbt_die("Not a valid model!"); @@ -604,28 +605,24 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre } if (current_routing == nullptr) { /* it is the first one */ - xbt_assert(simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a networking zone."); - simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ = new_zone; - + 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->getChildren()->push_back(static_cast(new_zone)); + current_routing->get_children()->push_back(new_zone); } /* set the new current component of the tree */ current_routing = new_zone; - - simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal + simgrid::s4u::NetZone::on_creation(*new_zone->get_iface()); // notify the signal return new_zone; } /** - * \brief Specify that the description of the current AS is finished + * @brief Specify that the description of the current AS 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. @@ -634,20 +631,20 @@ void sg_platf_new_Zone_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); - simgrid::s4u::NetZone::onSeal(*current_routing); - current_routing = static_cast(current_routing->getFather()); + simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); + current_routing = static_cast(current_routing->get_father()); } -/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ +/** @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) { - simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint; + simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->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."); + "Only hosts from Cluster and Vivaldi ASes can get a host_link."); - simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); - simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); + 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()); @@ -657,19 +654,19 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl 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->getCname(), netpoint->id()); - as_cluster->private_links_.insert({netpoint->id(), {linkUp, linkDown}}); + 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()}}); } -void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace) +void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile) { - tmgr_trace_t tmgr_trace; - if (not trace->file.empty()) { - tmgr_trace = tmgr_trace_new_from_file(trace->file); + simgrid::kernel::profile::Profile* mgr_profile; + if (not profile->file.empty()) { + mgr_profile = simgrid::kernel::profile::Profile::from_file(profile->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 profile->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + profile->id.c_str()); + mgr_profile = simgrid::kernel::profile::Profile::from_string(profile->id, profile->pc_data, profile->periodicity); } - traces_set_list.insert({trace->id, tmgr_trace}); + traces_set_list.insert({profile->id, mgr_profile}); }