Merge branch 's4u/model_list' into 'master'

[simgrid.git] / src / kernel / activity / CommImpl.cpp

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 0191ebf..f8de83a 100644 (file)
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -6,6 +6,7 @@
 #include "src/kernel/activity/CommImpl.hpp"
 #include "simgrid/Exception.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/modelchecker.h"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/activity/MailboxImpl.hpp"
@@ -80,8 +81,8 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen
   }
 
   /* Setup the communication synchro */
-  other_comm->src_actor_     = src_proc;
-  other_comm->src_data_      = data;
+  other_comm->src_actor_ = src_proc;
+  other_comm->src_data_  = data;
   (*other_comm).set_src_buff(src_buff, src_buff_size).set_size(task_size).set_rate(rate);
 
   other_comm->match_fun     = match_fun;
@@ -162,8 +163,8 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_
   }
 
   /* Setup communication synchro */
-  other_comm->dst_actor_     = receiver;
-  other_comm->dst_data_      = data;
+  other_comm->dst_actor_ = receiver;
+  other_comm->dst_data_  = data;
   other_comm->set_dst_buff(dst_buff, dst_buff_size);
 
   if (rate > -1.0 && (other_comm->get_rate() < 0.0 || rate < other_comm->get_rate()))
@@ -430,7 +431,12 @@ CommImpl* CommImpl::start()
     from_ = from_ != nullptr ? from_ : src_actor_->get_host();
     to_   = to_ != nullptr ? to_ : dst_actor_->get_host();
 
-    surf_action_ = surf_network_model->communicate(from_, to_, size_, rate_);
+    /* FIXME[donassolo]: getting the network_model from the origin host
+     * Soon we need to change this function to first get the routes and later
+     * create the respective surf actions */
+    auto* net_model = from_->get_netpoint()->get_englobing_zone()->get_network_model();
+
+    surf_action_ = net_model->communicate(from_, to_, size_, rate_);
     surf_action_->set_activity(this);
     surf_action_->set_category(get_tracing_category());
     state_ = State::RUNNING;