X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a5f54e7f74566a2418d243e7885e737c2312a36..48028d9fbcca84960514fb0622b9b22a48162cc0:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index ad5d6518a3..e7374e59c4 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,32 +1,29 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "simgrid/kernel/routing/ClusterZone.hpp" +#include "simgrid/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/s4u/Engine.hpp" -#include "simgrid/s4u/Storage.hpp" - +#include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" +#include "src/simix/smx_host_private.hpp" #include "src/simix/smx_private.hpp" - -#include "src/include/simgrid/sg_config.h" - #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" - -#include "src/kernel/routing/ClusterZone.hpp" -#include "src/kernel/routing/DijkstraZone.hpp" -#include "src/kernel/routing/DragonflyZone.hpp" -#include "src/kernel/routing/EmptyZone.hpp" -#include "src/kernel/routing/FatTreeZone.hpp" -#include "src/kernel/routing/FloydZone.hpp" -#include "src/kernel/routing/FullZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" -#include "src/kernel/routing/TorusZone.hpp" -#include "src/kernel/routing/VivaldiZone.hpp" +#include "src/surf/xml/platf_private.hpp" + #include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); XBT_PRIVATE std::map mount_list; @@ -35,14 +32,7 @@ XBT_PRIVATE std::vector known_storages; namespace simgrid { namespace surf { -simgrid::xbt::signal on_cluster; -} -} - -// FIXME: The following duplicates the content of s4u::Host -namespace simgrid { -namespace s4u { -extern std::map host_list; +simgrid::xbt::signal on_cluster; } } @@ -58,13 +48,14 @@ 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.disconnect_all_slots(); - simgrid::s4u::onPlatformCreated.disconnect_all_slots(); + simgrid::surf::on_cluster.disconnectSlots(); + simgrid::s4u::on_platform_created.disconnectSlots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -72,7 +63,7 @@ void sg_platf_exit() { } /** @brief Add an host to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t args) +void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) { std::map props; if (args->properties) { @@ -82,7 +73,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t 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(); @@ -91,7 +82,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) if (args->state_trace) host->pimpl_cpu->setStateTrace(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->setSpeedTrace(args->speed_trace); + host->pimpl_cpu->set_speed_trace(args->speed_trace); if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) @@ -105,7 +96,7 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const 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 = @@ -119,18 +110,18 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const return netpoint; } -void sg_platf_new_link(LinkCreationArgs* link) +void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) { std::vector names; - if (link->policy == SURF_LINK_FULLDUPLEX) { + if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { names.push_back(link->id+ "_UP"); names.push_back(link->id+ "_DOWN"); } else { names.push_back(link->id); } for (auto const& link_name : names) { - simgrid::surf::LinkImpl* l = + simgrid::kernel::resource::LinkImpl* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { @@ -148,7 +139,7 @@ void sg_platf_new_link(LinkCreationArgs* link) delete link->properties; } -void sg_platf_new_cluster(ClusterCreationArgs* cluster) +void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) { using simgrid::kernel::routing::ClusterZone; using simgrid::kernel::routing::DragonflyZone; @@ -158,34 +149,34 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) int rankId=0; // What an inventive way of initializing the AS that I have as ancestor :-( - ZoneCreationArgs zone; + simgrid::kernel::routing::ZoneCreationArgs zone; zone.id = cluster->id; switch (cluster->topology) { - case SURF_CLUSTER_TORUS: - zone.routing = A_surfxml_AS_routing_ClusterTorus; - break; - case SURF_CLUSTER_DRAGONFLY: - zone.routing = A_surfxml_AS_routing_ClusterDragonfly; - break; - case SURF_CLUSTER_FAT_TREE: - zone.routing = A_surfxml_AS_routing_ClusterFatTree; - break; - default: - zone.routing = A_surfxml_AS_routing_Cluster; - break; + case simgrid::kernel::routing::ClusterTopology::TORUS: + zone.routing = A_surfxml_AS_routing_ClusterTorus; + break; + case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: + zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; + case simgrid::kernel::routing::ClusterTopology::FAT_TREE: + zone.routing = A_surfxml_AS_routing_ClusterFatTree; + break; + default: + zone.routing = A_surfxml_AS_routing_Cluster; + break; } 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->loopback_bw > 0 || cluster->loopback_lat > 0){ - current_as->linkCountPerNode_++; - current_as->hasLoopback_ = true; + current_as->num_links_per_node_++; + current_as->has_loopback_ = true; } if(cluster->limiter_link > 0){ - current_as->linkCountPerNode_++; - current_as->hasLimiter_ = true; + current_as->num_links_per_node_++; + current_as->has_limiter_ = true; } for (int const& i : *cluster->radicals) { @@ -194,8 +185,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); + simgrid::kernel::routing::HostCreationArgs host; host.id = host_id.c_str(); if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { host.properties = new std::map; @@ -220,23 +210,23 @@ void sg_platf_new_cluster(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::kernel::resource::LinkImpl* linkUp = nullptr; + simgrid::kernel::resource::LinkImpl* 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); - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; link.bandwidth = 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::kernel::resource::LinkImpl::byName(tmp_link); + linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); - auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({as_cluster->nodePosition(rankId), {linkUp, linkDown}}); + auto* as_cluster = static_cast(current_as); + as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp, linkDown}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -246,22 +236,22 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) std::string tmp_link = std::string(link_id) + "_limiter"; XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; link.bandwidth = 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::kernel::resource::LinkImpl::byName(tmp_link); linkUp = linkDown; - current_as->privateLinks_.insert({current_as->nodePositionWithLoopback(rankId), {linkUp, linkDown}}); + current_as->private_links_.insert({current_as->node_pos_with_loopback(rankId), {linkUp, linkDown}}); } //call the cluster function that adds the others links - if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - static_cast(current_as)->addProcessingNode(i); + 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++; } @@ -280,7 +270,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) //Make the backbone if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - LinkCreationArgs link; + simgrid::kernel::routing::LinkCreationArgs link; link.id = std::string(cluster->id)+ "_backbone"; link.bandwidth = cluster->bb_bw; link.latency = cluster->bb_lat; @@ -289,7 +279,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) 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::kernel::resource::LinkImpl::byName(link.id)); } XBT_DEBUG(""); @@ -299,38 +289,37 @@ void sg_platf_new_cluster(ClusterCreationArgs* 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(CabinetCreationArgs* cabinet) +void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) { for (int const& radical : *cabinet->radicals) { std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); + simgrid::kernel::routing::HostCreationArgs host; host.pstate = 0; host.core_amount = 1; host.id = hostname.c_str(); host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - LinkCreationArgs link; - link.policy = SURF_LINK_FULLDUPLEX; + simgrid::kernel::routing::LinkCreationArgs link; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; link.id = "link_" + hostname; sg_platf_new_link(&link); - HostLinkCreationArgs host_link; + simgrid::kernel::routing::HostLinkCreationArgs host_link; host_link.id = hostname; host_link.link_up = std::string("link_") + hostname + "_UP"; host_link.link_down = std::string("link_") + hostname + "_DOWN"; @@ -339,7 +328,7 @@ void sg_platf_new_cabinet(CabinetCreationArgs* cabinet) delete cabinet->radicals; } -void sg_platf_new_storage(StorageCreationArgs* storage) +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()); @@ -379,7 +368,7 @@ void sg_platf_new_storage(StorageCreationArgs* storage) } } -void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) +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()); @@ -394,7 +383,7 @@ void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) storage_types[storage_type->id] = stype; } -void sg_platf_new_mount(MountCreationArgs* mount) +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()); @@ -403,29 +392,33 @@ void sg_platf_new_mount(MountCreationArgs* mount) if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); + mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->getImpl()}); } -void sg_platf_new_route(sg_platf_route_cbarg_t route) +void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { - routing_get_current()->addRoute(route); + 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(sg_platf_route_cbarg_t bypassRoute) +void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassRoute) { - routing_get_current()->addBypassRoute(bypassRoute); + 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_process(sg_platf_process_cbarg_t process) +void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) { - sg_host_t host = sg_host_by_name(process->host); + 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 process '") + process->function + "': host '" + process->host + + std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - for (auto const& kv : simgrid::s4u::host_list) { - simgrid::s4u::Host* host = kv.second; - msg += host->getName(); + + std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + + for (auto const& host : list) { + msg += host->get_name(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -435,40 +428,27 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) } xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); - xbt_assert(factory, "Function '%s' unknown", process->function); - - double start_time = process->start_time; - double kill_time = process->kill_time; - int auto_restart = process->on_failure == SURF_ACTOR_ON_FAILURE_DIE ? 0 : 1; + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + xbt_assert(factory, "Function '%s' unknown", actor->function); - std::vector args(process->argv, process->argv + process->argc); - std::function code = factory(std::move(args)); - std::shared_ptr> properties(process->properties); + double start_time = actor->start_time; + double kill_time = actor->kill_time; + bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; - smx_process_arg_t arg = nullptr; + std::string actor_name = actor->args[0]; + std::function code = factory(std::move(actor->args)); + std::shared_ptr> properties(actor->properties); - arg = new simgrid::simix::ProcessArg(); - arg->name = std::string(process->argv[0]); - arg->code = code; - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = 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); if (start_time > SIMIX_get_clock()) { - arg = new simgrid::simix::ProcessArg(); - arg->name = std::string(process->argv[0]); - arg->code = std::move(code); - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = properties; + 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); + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); SIMIX_timer_set(start_time, [arg, auto_restart]() { smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); @@ -479,7 +459,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr); @@ -494,14 +474,14 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) } } -void sg_platf_new_peer(PeerCreationArgs* peer) +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); + simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); @@ -509,28 +489,22 @@ void sg_platf_new_peer(PeerCreationArgs* peer) if (peer->state_trace) host->pimpl_cpu->setStateTrace(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->setSpeedTrace(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_trace(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - 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); + simgrid::config::set_value("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name.c_str()); @@ -567,9 +541,11 @@ static void surf_config_models_setup() * * @param zone the parameters defining the Zone to build. */ -simgrid::s4u::NetZone* sg_platf_new_Zone_begin(ZoneCreationArgs* zone) +simgrid::s4u::NetZone* 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 * @@ -623,10 +599,7 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(ZoneCreationArgs* zone) } 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); } else { /* set the father behavior */ if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) @@ -637,7 +610,6 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(ZoneCreationArgs* zone) /* set the new current component of the tree */ current_routing = new_zone; - simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal return new_zone; @@ -658,29 +630,29 @@ void sg_platf_new_Zone_seal() } /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ -void sg_platf_new_hostlink(HostLinkCreationArgs* hostlink) +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; xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); - simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); + simgrid::kernel::resource::LinkImpl* linkUp = simgrid::kernel::resource::LinkImpl::byName(hostlink->link_up); + simgrid::kernel::resource::LinkImpl* linkDown = simgrid::kernel::resource::LinkImpl::byName(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); + auto* as_cluster = static_cast(current_routing); - if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) + 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->privateLinks_.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, linkDown}}); } -void sg_platf_new_trace(TraceCreationArgs* trace) +void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace) { tmgr_trace_t tmgr_trace; if (not trace->file.empty()) {