cleanups in smpi, mostly cosmetic stuff and indent

[simgrid.git] / src / smpi / mpi / smpi_request.cpp

diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index 3a01a16..759f0f5 100644 (file)
--- a/src/smpi/mpi/smpi_request.cpp
+++ b/src/smpi/mpi/smpi_request.cpp
@@ -15,7 +15,6 @@
 #include "smpi_op.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/mc/mc_replay.hpp"
-#include "src/simix/ActorImpl.hpp"
 #include "src/smpi/include/smpi_actor.hpp"
 #include "xbt/config.hpp"
 
@@ -72,42 +71,6 @@ Request::Request(void* buf, int count, MPI_Datatype datatype, int src, int dst,
   cancelled_ = 0;
 }
 
-MPI_Comm Request::comm(){
-  return comm_;
-}
-
-int Request::src(){
-  return src_;
-}
-
-int Request::dst(){
-  return dst_;
-}
-
-int Request::tag(){
-  return tag_;
-}
-
-int Request::flags(){
-  return flags_;
-}
-
-int Request::detached(){
-  return detached_;
-}
-
-MPI_Datatype Request::type(){
-  return old_type_;
-}
-
-size_t Request::size(){
-  return size_;
-}
-
-size_t Request::real_size(){
-  return real_size_;
-}
-
 void Request::ref(){
   refcount_++;
 }
@@ -361,7 +324,7 @@ void Request::sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,int d
 
 void Request::start()
 {
-  s4u::MailboxPtr mailbox;
+  s4u::Mailbox* mailbox;
 
   xbt_assert(action_ == nullptr, "Cannot (re-)start unfinished communication");
   flags_ &= ~MPI_REQ_PREPARED;
@@ -516,7 +479,7 @@ void Request::start()
 
     /* FIXME: detached sends are not traceable (action_ == nullptr) */
     if (action_ != nullptr) {
-      std::string category = TRACE_internal_smpi_get_category();
+      std::string category = smpi_process()->get_tracing_category();
       simgrid::simix::simcall([this, category] { this->action_->set_category(category); });
     }
 
@@ -707,7 +670,7 @@ void Request::iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
         ->wait();
   }
   // behave like a receive, but don't do it
-  s4u::MailboxPtr mailbox;
+  s4u::Mailbox* mailbox;
 
   request->print_request("New iprobe");
   // We have to test both mailboxes as we don't know if we will receive one one or another