Added one more missing MPI call.

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index cdbf7a9..d457c76 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -11,15 +11,17 @@
 #include "xbt/xbt_os_time.h"
 #include "simix/simix.h"
 #include "smpi/smpi.h"
-#include "instr/private.h"
+#include "smpi/smpif.h"
+#include "smpi/smpi_cocci.h"
+#include "instr/instr_private.h"
 
 struct s_smpi_process_data;
 typedef struct s_smpi_process_data *smpi_process_data_t;
 
-#define PERSISTENT     0x0
-#define NON_PERSISTENT 0x1
-#define SEND           0x0
-#define RECV           0x2
+#define PERSISTENT     0x1
+#define NON_PERSISTENT 0x2
+#define SEND           0x4
+#define RECV           0x8
 
 typedef struct s_smpi_mpi_request {
   void *buf;
@@ -28,10 +30,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;
@@ -45,13 +44,13 @@ void smpi_process_destroy(void);
 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);
@@ -84,6 +83,7 @@ MPI_Comm smpi_comm_new(MPI_Group group);
 void smpi_comm_destroy(MPI_Comm comm);
 MPI_Group smpi_comm_group(MPI_Comm comm);
 int smpi_comm_size(MPI_Comm comm);
+void smpi_comm_get_name(MPI_Comm comm, char* name, int* len);
 int smpi_comm_rank(MPI_Comm comm);
 MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key);
 
@@ -177,7 +177,56 @@ 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*);
+void mpi_finalize__(int*);
+void mpi_abort__(int* comm, int* errorcode, int* ierr);
+void mpi_comm_rank__(int* comm, int* rank, int* ierr);
+void mpi_comm_size__(int* comm, int* size, int* ierr);
+double mpi_wtime__(void);
+
+void mpi_comm_dup__(int* comm, int* newcomm, int* ierr);
+void mpi_comm_split__(int* comm, int* color, int* key, int* comm_out, int* ierr);
+
+void mpi_send_init__(void *buf, int* count, int* datatype, int* dst, int* tag,
+                     int* comm, int* request, int* ierr);
+void mpi_isend__(void *buf, int* count, int* datatype, int* dst,
+                 int* tag, int* comm, int* request, int* ierr);
+void mpi_send__(void* buf, int* count, int* datatype, int* dst,
+                int* tag, int* comm, int* ierr);
+void mpi_recv_init__(void *buf, int* count, int* datatype, int* src, int* tag,
+                     int* comm, int* request, int* ierr);
+void mpi_irecv__(void *buf, int* count, int* datatype, int* src, int* tag,
+                 int* comm, int* request, int* ierr);
+void mpi_recv__(void* buf, int* count, int* datatype, int* src,
+                int* tag, int* comm, MPI_Status* status, int* ierr);
+void mpi_start__(int* request, int* ierr);
+void mpi_startall__(int* count, int* requests, int* ierr);
+void mpi_wait__(int* request, MPI_Status* status, int* ierr);
+void mpi_waitany__(int* count, int* requests, int* index, MPI_Status* status, int* ierr);
+void mpi_waitall__(int* count, int* requests, MPI_Status* status, int* ierr);
+
+void mpi_barrier__(int* comm, int* ierr);
+void mpi_bcast__(void* buf, int* count, int* datatype, int* root, int* comm, int* ierr);
+void mpi_reduce__(void* sendbuf, void* recvbuf, int* count,
+                  int* datatype, int* op, int* root, int* comm, int* ierr);
+void mpi_allreduce__(void* sendbuf, void* recvbuf, int* count, int* datatype,
+                     int* op, int* comm, int* ierr);
+void mpi_scatter__(void* sendbuf, int* sendcount, int* sendtype,
+                   void* recvbuf, int* recvcount, int* recvtype, 
+                   int* root, int* comm, int* ierr);
+void mpi_gather__(void* sendbuf, int* sendcount, int* sendtype,
+                  void* recvbuf, int* recvcount, int* recvtype,
+                  int* root, int* comm, int* ierr);
+void mpi_allgather__(void* sendbuf, int* sendcount, int* sendtype,
+                     void* recvbuf, int* recvcount, int* recvtype,
+                     int* comm, int* ierr);
+void mpi_scan__(void* sendbuf, void* recvbuf, int* count, int* datatype,
+                int* op, int* comm, int* ierr);
+void mpi_alltoall__(void* sendbuf, int* sendcount, int* sendtype,
+                    void* recvbuf, int* recvcount, int* recvtype, int* comm, int* ierr);
 
 #endif