From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Tue, 2 Apr 2019 11:24:56 +0000 (+0200)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid into CRTP
X-Git-Tag: v3.25~558
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d648ebbbe5705878080b9cbf1ca61497323c592

Merge branch 'master' of https://framagit.org/simgrid/simgrid into CRTP
---

4d648ebbbe5705878080b9cbf1ca61497323c592
diff --cc src/s4u/s4u_Comm.cpp
index 03d222affe,d8c952b3c7..188fda5788
--- a/src/s4u/s4u_Comm.cpp
+++ b/src/s4u/s4u_Comm.cpp
@@@ -112,14 -112,14 +112,14 @@@ Comm* Comm::start(
               __FUNCTION__);
  
    if (src_buff_ != nullptr) { // Sender side
-     on_sender_start(Actor::self());
+     on_sender_start(*Actor::self());
      pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
 -                                clean_fun_, copy_data_function_, user_data_, detached_);
 +                                clean_fun_, copy_data_function_, get_user_data(), detached_);
    } else if (dst_buff_ != nullptr) { // Receiver side
      xbt_assert(not detached_, "Receive cannot be detached");
-     on_receiver_start(Actor::self());
+     on_receiver_start(*Actor::self());
      pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
 -                                copy_data_function_, user_data_, rate_);
 +                                copy_data_function_, get_user_data(), rate_);
  
    } else {
      xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver");
@@@ -148,14 -148,14 +148,14 @@@ Comm* Comm::wait_for(double timeout
  
      case State::INITED: // It's not started yet. Do it in one simcall
        if (src_buff_ != nullptr) {
-         on_sender_start(Actor::self());
+         on_sender_start(*Actor::self());
          simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
 -                          copy_data_function_, user_data_, timeout);
 +                          copy_data_function_, get_user_data(), timeout);
  
        } else { // Receiver
-         on_receiver_start(Actor::self());
+         on_receiver_start(*Actor::self());
          simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
 -                          user_data_, timeout, rate_);
 +                          get_user_data(), timeout, rate_);
        }
        state_ = State::FINISHED;
        break;