Merge branch 'master' of framagit.org:simgrid/simgrid

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

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 0191ebf65da67211094dd243a44e5ff86eedaa80..44dcf485997fabda892f4e715d38c037e5823c6c 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"
@@ -15,7 +16,6 @@
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 
-#include <boost/range/algorithm.hpp>
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
 
 XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size,
@@ -80,8 +80,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 +162,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()))
@@ -283,20 +283,14 @@ static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
   simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
   size_t count                                = simcall_comm_waitany__get__count(simcall);
 
-  for (size_t i = 0; i < count; i++) {
-    // Remove the first occurrence of simcall:
-    auto* comm = comms[i];
-    auto j     = boost::range::find(comm->simcalls_, simcall);
-    if (j != comm->simcalls_.end())
-      comm->simcalls_.erase(j);
-  }
+  for (size_t i = 0; i < count; i++)
+    comms[i]->unregister_simcall(simcall);
 }
 void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count,
                                   double timeout)
 {
   if (MC_is_active() || MC_record_replay_is_active()) {
-    if (timeout > 0.0)
-      xbt_die("Timeout not implemented for waitany in the model-checker");
+    xbt_assert(timeout <= 0.0, "Timeout not implemented for waitany in the model-checker");
     int idx                 = simcall->mc_value_;
     auto* comm              = comms[idx];
     comm->simcalls_.push_back(simcall);
@@ -334,8 +328,10 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
 /******************************************************************************/
 /*                    SIMIX_comm_copy_data callbacks                       */
 /******************************************************************************/
-static void (*SIMIX_comm_copy_data_callback)(simgrid::kernel::activity::CommImpl*, void*,
-                                             size_t) = &SIMIX_comm_copy_pointer_callback;
+void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t))
+{
+  simgrid::kernel::activity::CommImpl::set_copy_data_callback(callback);
+}
 
 void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
 {
@@ -348,11 +344,6 @@ void SIMIX_comm_copy_buffer_callback(simgrid::kernel::activity::CommImpl* comm,
   }
 }
 
-void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t))
-{
-  SIMIX_comm_copy_data_callback = callback;
-}
-
 void SIMIX_comm_copy_pointer_callback(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
 {
   xbt_assert((buff_size == sizeof(void*)), "Cannot copy %zu bytes: must be sizeof(void*)", buff_size);
@@ -363,6 +354,13 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
+void (*CommImpl::copy_data_callback_)(CommImpl*, void*, size_t) = &SIMIX_comm_copy_pointer_callback;
+
+void CommImpl::set_copy_data_callback(void (*callback)(CommImpl*, void*, size_t))
+{
+  copy_data_callback_ = callback;
+}
+
 CommImpl& CommImpl::set_size(double size)
 {
   size_ = size;
@@ -430,7 +428,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;
@@ -479,7 +482,7 @@ void CommImpl::copy_data()
 
   /* Copy at most dst_buff_size bytes of the message to receiver's buffer */
   if (dst_buff_size_) {
-    buff_size = std::min(buff_size, *(dst_buff_size_));
+    buff_size = std::min(buff_size, *dst_buff_size_);
 
     /* Update the receiver's buffer size to the copied amount */
     *dst_buff_size_ = buff_size;
@@ -489,7 +492,7 @@ void CommImpl::copy_data()
     if (copy_data_fun)
       copy_data_fun(this, src_buff_, buff_size);
     else
-      SIMIX_comm_copy_data_callback(this, src_buff_, buff_size);
+      copy_data_callback_(this, src_buff_, buff_size);
   }
 
   /* Set the copied flag so we copy data only once */