simplification

[simgrid.git] / src / surf / network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 1fda88f01047138fd44f35b244abe978d9f1d893..b09cd481163b5baaf481522dc36a22505a56431f 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -6,6 +6,7 @@
 #include "src/surf/network_ib.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "surf/surf.hpp"
@@ -21,7 +22,7 @@ static void IB_create_host_callback(simgrid::s4u::Host const& host)
   using simgrid::kernel::resource::NetworkIBModel;
 
   static int id = 0;
-  auto* ibModel = static_cast<NetworkIBModel*>(host.get_netpoint()->get_englobing_zone()->get_network_model());
+  auto* ibModel = static_cast<NetworkIBModel*>(host.get_netpoint()->get_englobing_zone()->get_network_model().get());
   ibModel->active_nodes.emplace(host.get_name(), IBNode(id));
   id++;
 }
@@ -68,10 +69,10 @@ static void IB_action_init_callback(simgrid::kernel::resource::NetworkAction& ac
 /*  } */
 void surf_network_model_init_IB()
 {
-  /* FIXME[donassolo]: this smells bad, but works
-   * (the constructor saves its pointer in all_existing_models and models_by_type :O).
-   * We need a manager for these models */
-  new simgrid::kernel::resource::NetworkIBModel();
+  auto net_model = std::make_shared<simgrid::kernel::resource::NetworkIBModel>("Network_IB");
+  simgrid::kernel::EngineImpl::get_instance()->add_model(net_model);
+  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_network_model(net_model);
+
   simgrid::s4u::Link::on_communication_state_change.connect(IB_action_state_changed_callback);
   simgrid::s4u::Link::on_communicate.connect(IB_action_init_callback);
   simgrid::s4u::Host::on_creation.connect(IB_create_host_callback);
@@ -82,10 +83,8 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
-NetworkIBModel::NetworkIBModel() : NetworkSmpiModel()
+NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkSmpiModel(name)
 {
-  /* Do not add this into all_existing_models: our ancestor already does so */
-
   std::string IB_factors_string = config::get_value<std::string>("smpi/IB-penalty-factors");
   std::vector<std::string> radical_elements;
   boost::split(radical_elements, IB_factors_string, boost::is_any_of(";"));