react to the proper signals

[simgrid.git] / src / kernel / resource / models / network_ib.cpp

diff --git a/src/kernel/resource/models/network_ib.cpp b/src/kernel/resource/models/network_ib.cpp
index e00b347..df4abf1 100644 (file)
--- a/src/kernel/resource/models/network_ib.cpp
+++ b/src/kernel/resource/models/network_ib.cpp
@@ -41,7 +41,7 @@ SIMGRID_REGISTER_NETWORK_MODEL(
       engine->get_netzone_root()->set_network_model(net_model);
 
       simgrid::s4u::Link::on_communication_state_change_cb(NetworkIBModel::IB_action_state_changed_callback);
-      simgrid::kernel::activity::CommImpl::on_start.connect(NetworkIBModel::IB_comm_start_callback);
+      simgrid::s4u::Comm::on_start_cb(NetworkIBModel::IB_comm_start_callback);
       simgrid::s4u::Host::on_creation_cb(NetworkIBModel::IB_create_host_callback);
       simgrid::config::set_default<double>("network/weight-S", 8775);
     });
@@ -64,19 +64,19 @@ void NetworkIBModel::IB_action_state_changed_callback(NetworkAction& action, Act
   auto [src, dst] = ibModel->active_comms[&action];
 
   XBT_DEBUG("IB callback - action %p finished", &action);
-  ibModel->update_IB_factors(&action, src, dst, 1);
+  ibModel->update_IB_factors(&action, src, dst, true);
   ibModel->active_comms.erase(&action);
 }
 
-void NetworkIBModel::IB_comm_start_callback(const activity::CommImpl& comm)
+void NetworkIBModel::IB_comm_start_callback(const s4u::Comm& comm)
 {
-  auto* action  = static_cast<NetworkAction*>(comm.model_action_);
+  auto* action  = static_cast<NetworkAction*>(static_cast<activity::CommImpl*>(comm.get_impl())->model_action_);
   auto* ibModel = static_cast<NetworkIBModel*>(action->get_model());
   auto* act_src = &ibModel->active_nodes.at(action->get_src().get_name());
   auto* act_dst = &ibModel->active_nodes.at(action->get_dst().get_name());
 
   ibModel->active_comms[action] = std::make_pair(act_src, act_dst);
-  ibModel->update_IB_factors(action, act_src, act_dst, 0);
+  ibModel->update_IB_factors(action, act_src, act_dst, false);
 }
 
 NetworkIBModel::NetworkIBModel(const std::string& name) : NetworkCm02Model(name)
@@ -170,7 +170,7 @@ void NetworkIBModel::update_IB_factors_rec(IBNode* root, std::vector<bool>& upda
   }
 }
 
-void NetworkIBModel::update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const
+void NetworkIBModel::update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, bool remove) const
 {
   if (from == to) // disregard local comms (should use loopback)
     return;