Merge branch 'v3_8_x'

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 71a9ec8..fe03a57 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -11,9 +11,7 @@
 #include "xbt/xbt_os_time.h"
 #include "simgrid/simix.h"
 #include "smpi/smpi.h"
-#ifdef SMPI_F2C
 #include "smpi/smpif.h"
-#endif
 #include "smpi/smpi_cocci.h"
 #include "instr/instr_private.h"
 
@@ -179,7 +177,7 @@ int smpi_mpi_get_count(MPI_Status * status, MPI_Datatype datatype);
 void smpi_mpi_wait(MPI_Request * request, MPI_Status * status);
 int smpi_mpi_waitany(int count, MPI_Request requests[],
                      MPI_Status * status);
-void smpi_mpi_waitall(int count, MPI_Request requests[],
+int smpi_mpi_waitall(int count, MPI_Request requests[],
                       MPI_Status status[]);
 int smpi_mpi_waitsome(int incount, MPI_Request requests[], int *indices,
                       MPI_Status status[]);
@@ -252,6 +250,7 @@ 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);
+double mpi_wtick__(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);
@@ -289,9 +288,20 @@ void mpi_gather__(void* sendbuf, int* sendcount, int* sendtype,
 void mpi_allgather__(void* sendbuf, int* sendcount, int* sendtype,
                      void* recvbuf, int* recvcount, int* recvtype,
                      int* comm, int* ierr);
+void mpi_allgatherv__(void* sendbuf, int* sendcount, int* sendtype,
+                     void* recvbuf, int* recvcount,int* displs, int* recvtype,
+                     int* comm, int* ierr) ;
+void mpi_type_size__(int* datatype, int *size, 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);
+void mpi_get_processor_name__(char *name, int *resultlen, int* ierr);
+void mpi_test__ (int * request, int *flag, MPI_Status * status, int* ierr);
+void mpi_get_count__(MPI_Status * status, int* datatype, int *count, int* ierr);
+void mpi_type_extent__(int* datatype, MPI_Aint * extent, int* ierr);
+void mpi_type_lb__(int* datatype, MPI_Aint * extent, int* ierr);
+void mpi_type_ub__(int* datatype, MPI_Aint * extent, int* ierr);
 
 #endif