X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c19a107a096f503e67217fb178fa98eb742ceb4d..e068b16d3bc99cbd29711672b7efc94e04ac192e:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 9d06f9e023..ba728d4436 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -4,6 +4,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "network_constant.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/surf/surf_interface.hpp" #include "surf/surf.hpp" @@ -14,21 +17,20 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network); *********/ void surf_network_model_init_Constant() { - xbt_assert(surf_network_model == nullptr); - surf_network_model = new simgrid::kernel::resource::NetworkConstantModel(); + auto net_model = std::make_shared(); + simgrid::kernel::EngineImpl::get_instance()->add_model(simgrid::kernel::resource::Model::Type::NETWORK, net_model, + true); + simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model); } namespace simgrid { namespace kernel { namespace resource { -NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL) -{ - all_existing_models.push_back(this); -} +NetworkConstantModel::NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::FULL) {} LinkImpl* NetworkConstantModel::create_link(const std::string& name, const std::vector& /*bandwidth*/, - double /*latency*/, s4u::Link::SharingPolicy) + s4u::Link::SharingPolicy) { xbt_die("Refusing to create the link %s: there is no link in the Constant network model. " "Please remove any link from your platform (and switch to routing='None')",