X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/80b6c5866da8d8769469266da46c7ce979e23b8f..cd8852187f491f7fa8049414d7ac2d0193518e23:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 7a68609606..eaafa4986f 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -12,7 +12,7 @@
 #include "simix/simix.h"
 #include "smpi/smpi.h"
 #include "smpi/smpif.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
 
 struct s_smpi_process_data;
 typedef struct s_smpi_process_data *smpi_process_data_t;
@@ -29,10 +29,7 @@ typedef struct s_smpi_mpi_request {
   int dst;
   int tag;
   MPI_Comm comm;
-  smx_rdv_t rdv;
-  smx_comm_t pair;
-  int complete;
-  MPI_Request match;
+  smx_action_t action;
   unsigned flags;
 #ifdef HAVE_TRACING
   int send;
@@ -47,13 +44,13 @@ smpi_process_data_t smpi_process_data(void);
 smpi_process_data_t smpi_process_remote_data(int index);
 int smpi_process_count(void);
 int smpi_process_index(void);
+smx_rdv_t smpi_process_mailbox(void);
+smx_rdv_t smpi_process_remote_mailbox(int index);
 xbt_os_timer_t smpi_process_timer(void);
 void smpi_process_simulated_start(void);
 double smpi_process_simulated_elapsed(void);
 
 void print_request(const char *message, MPI_Request request);
-void smpi_process_post_send(MPI_Comm comm, MPI_Request request);
-void smpi_process_post_recv(MPI_Request request);
 
 void smpi_global_init(void);
 void smpi_global_destroy(void);
@@ -179,8 +176,8 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
 
 // utilities
 void smpi_bench_destroy(void);
-void smpi_bench_begin(int rank, const char *mpi_call);
-void smpi_bench_end(int rank, const char *mpi_call);
+void smpi_bench_begin(void);
+void smpi_bench_end(void);
 
 // f77 wrappers
 void mpi_init__(int*);