X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fada0c05d54537c3d7545b45dd00d69424379d7..debe4e5871c0c3d1c714bbb1bd28ba7147454aa5:/src/surf/network_ib.cpp

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index 14bf4828df..7d5efb2b61 100644
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-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. */
@@ -27,12 +27,13 @@ static void IB_create_host_callback(simgrid::s4u::Host& host){
   ((NetworkIBModel*)surf_network_model)->active_nodes.insert({host.get_name(), act});
 }
 
-static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction* action)
+static void IB_action_state_changed_callback(simgrid::kernel::resource::NetworkAction* action,
+                                             simgrid::kernel::resource::Action::State /*previous*/)
 {
   using simgrid::kernel::resource::IBNode;
   using simgrid::kernel::resource::NetworkIBModel;
 
-  if (action->get_state() != simgrid::kernel::resource::Action::State::done)
+  if (action->get_state() != simgrid::kernel::resource::Action::State::FINISHED)
     return;
   std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
   XBT_DEBUG("IB callback - action %p finished", action);
@@ -85,16 +86,13 @@ static void IB_action_init_callback(simgrid::kernel::resource::NetworkAction* ac
 /*  } */
 void surf_network_model_init_IB()
 {
-  if (surf_network_model)
-    return;
+  xbt_assert(surf_network_model == nullptr, "Cannot set the network model twice");
 
   surf_network_model = new simgrid::kernel::resource::NetworkIBModel();
-  all_existing_models->push_back(surf_network_model);
-  simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback);
-  simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback);
-  simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
-  xbt_cfg_setdefault_double("network/weight-S", 8775);
-
+  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);
+  simgrid::config::set_default<double>("network/weight-S", 8775);
 }
 
 namespace simgrid {
@@ -103,7 +101,9 @@ namespace resource {
 
 NetworkIBModel::NetworkIBModel() : NetworkSmpiModel()
 {
-  std::string IB_factors_string = simgrid::config::get_config<std::string>("smpi/IB-penalty-factors");
+  /* Do not add this into all_existing_models: our ancestor already does so */
+
+  std::string IB_factors_string = simgrid::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(";"));