X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/57588c3696134c233df4059f48b4188310805d83..d5b29830df70e823202e384a7655e4371193ecd7:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 288fef0573..79883f4f1b 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Storage.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" @@ -99,7 +100,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); - + } /** @brief Add a "router" to the network element list */ @@ -423,8 +424,7 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert( - {std::string(mount->name), surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId))}); + mount_list.insert({std::string(mount->name), simgrid::surf::StorageImpl::byName(mount->storageId)}); } void sg_platf_new_route(sg_platf_route_cbarg_t route) @@ -647,7 +647,7 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing == nullptr) { /* it is the first one */ xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a AS"); + "All defined components must belong to a networking zone."); simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as; } else { @@ -677,7 +677,7 @@ void sg_platf_new_AS_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->father()); + current_routing = static_cast(current_routing->father()); } /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */