X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a95bc05581fb3ba6233e1e9c0fbb0715bd6f2cf9..1747902010b7fc57b15c2e88473c5bb118d362d1:/src/kernel/activity/CommImpl.cpp

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 97495307e0..f8de83ad91 100644
--- 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"
@@ -26,7 +27,7 @@ XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sr
 {
   simgrid::kernel::activity::ActivityImplPtr comm = simcall_HANDLER_comm_isend(
       simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, false);
-  SIMCALL_SET_MC_VALUE(*simcall, 0);
+  simcall->mc_value_ = 0;
   simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
 }
 
@@ -41,8 +42,8 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen
   XBT_DEBUG("send from mailbox %p", mbox);
 
   /* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */
-  simgrid::kernel::activity::CommImplPtr this_comm(new simgrid::kernel::activity::CommImpl());
-  this_comm->set_type(simgrid::kernel::activity::CommImpl::Type::SEND);
+  simgrid::kernel::activity::CommImplPtr this_comm(
+      new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::SEND));
 
   /* Look for communication synchro matching our needs. We also provide a description of
    * ourself so that the other side also gets a chance of choosing if it wants to match with us.
@@ -69,7 +70,6 @@ XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isen
     XBT_DEBUG("Receive already pushed");
 
     other_comm->state_ = simgrid::kernel::activity::State::READY;
-    other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY);
   }
 
   if (detached) {
@@ -81,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;
@@ -104,7 +104,7 @@ XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re
 {
   simgrid::kernel::activity::ActivityImplPtr comm = simcall_HANDLER_comm_irecv(
       simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate);
-  SIMCALL_SET_MC_VALUE(*simcall, 0);
+  simcall->mc_value_ = 0;
   simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
 }
 
@@ -114,8 +114,8 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_
                            void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data,
                            double rate)
 {
-  simgrid::kernel::activity::CommImplPtr this_synchro(new simgrid::kernel::activity::CommImpl());
-  this_synchro->set_type(simgrid::kernel::activity::CommImpl::Type::RECEIVE);
+  simgrid::kernel::activity::CommImplPtr this_synchro(
+      new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::RECEIVE));
   XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get());
 
   simgrid::kernel::activity::CommImplPtr other_comm;
@@ -136,7 +136,7 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_
       if (other_comm->surf_action_ && other_comm->get_remaining() < 1e-12) {
         XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get());
         other_comm->state_ = simgrid::kernel::activity::State::DONE;
-        other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE).set_mailbox(nullptr);
+        other_comm->set_mailbox(nullptr);
       }
     }
   } else {
@@ -158,14 +158,13 @@ simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_
       XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get());
 
       other_comm->state_ = simgrid::kernel::activity::State::READY;
-      other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY);
     }
     receiver->activities_.emplace_back(other_comm);
   }
 
   /* 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()))
@@ -190,7 +189,7 @@ void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
   comm->register_simcall(simcall);
 
   if (MC_is_active() || MC_record_replay_is_active()) {
-    int idx = SIMCALL_GET_MC_VALUE(*simcall);
+    int idx = simcall->mc_value_;
     if (idx == 0) {
       comm->state_ = simgrid::kernel::activity::State::DONE;
     } else {
@@ -254,7 +253,7 @@ void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi
   simcall_comm_testany__set__result(simcall, -1);
 
   if (MC_is_active() || MC_record_replay_is_active()) {
-    int idx = SIMCALL_GET_MC_VALUE(*simcall);
+    int idx = simcall->mc_value_;
     if (idx == -1) {
       simcall->issuer_->simcall_answer();
     } else {
@@ -299,7 +298,7 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
   if (MC_is_active() || MC_record_replay_is_active()) {
     if (timeout > 0.0)
       xbt_die("Timeout not implemented for waitany in the model-checker");
-    int idx                 = SIMCALL_GET_MC_VALUE(*simcall);
+    int idx                 = simcall->mc_value_;
     auto* comm              = comms[idx];
     comm->simcalls_.push_back(simcall);
     simcall_comm_waitany__set__result(simcall, idx);
@@ -365,12 +364,6 @@ namespace simgrid {
 namespace kernel {
 namespace activity {
 
-CommImpl& CommImpl::set_type(CommImpl::Type type)
-{
-  type_ = type;
-  return *this;
-}
-
 CommImpl& CommImpl::set_size(double size)
 {
   size_ = size;
@@ -415,7 +408,7 @@ CommImpl::CommImpl(s4u::Host* from, s4u::Host* to, double bytes) : size_(bytes),
 
 CommImpl::~CommImpl()
 {
-  XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast<int>(state_), detached_);
+  XBT_DEBUG("Really free communication %p in state %s (detached = %d)", this, get_state_str(), detached_);
 
   cleanup_surf();
 
@@ -438,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;
@@ -694,30 +692,21 @@ void CommImpl::finish()
       }
       CommImpl** element = std::find(comms, comms + count, this);
       int rank           = (element != comms + count) ? element - comms : -1;
-
       // In order to modify the exception we have to rethrow it:
       try {
         std::rethrow_exception(simcall->issuer_->exception_);
       } catch (simgrid::Exception& e) {
-        e.value = rank;
+        e.set_value(rank);
       }
     }
 
     simcall->issuer_->waiting_synchro_ = nullptr;
     simcall->issuer_->activities_.remove(this);
     if (detached_) {
-      if (simcall->issuer_ == src_actor_) {
-        if (dst_actor_)
-          dst_actor_->activities_.remove(this);
-      } else if (simcall->issuer_ == dst_actor_) {
-        if (src_actor_)
-          src_actor_->activities_.remove(this);
-      } else {
-        if (dst_actor_ != nullptr)
-          dst_actor_->activities_.remove(this);
-        if (src_actor_ != nullptr)
-          src_actor_->activities_.remove(this);
-      }
+      if (simcall->issuer_ != dst_actor_ && dst_actor_ != nullptr)
+        dst_actor_->activities_.remove(this);
+      if (simcall->issuer_ != src_actor_ && src_actor_ != nullptr)
+        src_actor_->activities_.remove(this);
     }
   }
 }