add a bunch of bindings/new definitions of unimplemented MPI-2 functions, to make...

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 3831ae2..f36e868 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -10,6 +10,7 @@
 #include "xbt.h"
 #include "xbt/xbt_os_time.h"
 #include "simgrid/simix.h"
+#include "smpi/smpi_interface.h"
 #include "smpi/smpi.h"
 #include "smpi/smpif.h"
 #include "smpi/smpi_cocci.h"
@@ -22,8 +23,9 @@ typedef struct s_smpi_process_data *smpi_process_data_t;
 #define NON_PERSISTENT 0x2
 #define SEND           0x4
 #define RECV           0x8
-#define RECV_DELETE     0x10
-
+#define RECV_DELETE    0x10
+#define ISEND          0x20
+#define SSEND          0x40
 // this struct is here to handle the problem of non-contignous data
 // for each such structure these function should be implemented (vector
 // index hvector hindex struct)
@@ -69,6 +71,8 @@ typedef struct s_smpi_mpi_request {
   smx_action_t action;
   unsigned flags;
   int detached;
+  MPI_Request detached_sender;
+  int refcount;
 #ifdef HAVE_TRACING
   int send;
   int recv;
@@ -157,6 +161,8 @@ MPI_Request smpi_mpi_send_init(void *buf, int count, MPI_Datatype datatype,
                                int dst, int tag, MPI_Comm comm);
 MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype,
                                int src, int tag, MPI_Comm comm);
+MPI_Request smpi_mpi_ssend_init(void *buf, int count, MPI_Datatype datatype,
+                               int dst, int tag, MPI_Comm comm);
 void smpi_mpi_start(MPI_Request request);
 void smpi_mpi_startall(int count, MPI_Request * requests);
 void smpi_mpi_request_free(MPI_Request * request);
@@ -164,6 +170,8 @@ MPI_Request smpi_isend_init(void *buf, int count, MPI_Datatype datatype,
                             int dst, int tag, MPI_Comm comm);
 MPI_Request smpi_mpi_isend(void *buf, int count, MPI_Datatype datatype,
                            int dst, int tag, MPI_Comm comm);
+MPI_Request smpi_mpi_issend(void *buf, int count, MPI_Datatype datatype,
+                           int dst, int tag, MPI_Comm comm);
 MPI_Request smpi_irecv_init(void *buf, int count, MPI_Datatype datatype,
                             int src, int tag, MPI_Comm comm);
 MPI_Request smpi_mpi_irecv(void *buf, int count, MPI_Datatype datatype,
@@ -172,6 +180,8 @@ void smpi_mpi_recv(void *buf, int count, MPI_Datatype datatype, int src,
                    int tag, MPI_Comm comm, MPI_Status * status);
 void smpi_mpi_send(void *buf, int count, MPI_Datatype datatype, int dst,
                    int tag, MPI_Comm comm);
+void smpi_mpi_ssend(void *buf, int count, MPI_Datatype datatype, int dst,
+                   int tag, MPI_Comm comm);
 void smpi_mpi_sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                        int dst, int sendtag, void *recvbuf, int recvcount,
                        MPI_Datatype recvtype, int src, int recvtag,
@@ -229,6 +239,10 @@ void nary_tree_bcast(void *buf, int count, MPI_Datatype datatype, int root,
                      MPI_Comm comm, int arity);
 void nary_tree_barrier(MPI_Comm comm, int arity);
 
+int smpi_coll_tuned_alltoall_ompi(void *sendbuf, int sendcount,
+                                      MPI_Datatype sendtype, void *recvbuf,
+                                      int recvcount, MPI_Datatype recvtype,
+                                      MPI_Comm comm);
 int smpi_coll_tuned_alltoall_bruck(void *sendbuf, int sendcount,
                                    MPI_Datatype sendtype, void *recvbuf,
                                    int recvcount, MPI_Datatype recvtype,
@@ -328,16 +342,40 @@ void mpi_alltoallv__(void* sendbuf, int* sendcounts, int* senddisps, int* sendty
                     void* recvbuf, int* recvcounts, int* recvdisps, 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_testall__ (int* count, int * requests,  int *flag, MPI_Status * statuses, 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_attr_get__(int* comm, int* keyval, void* attr_value, int* flag, int* ierr );
+void mpi_type_commit__(int* datatype,  int* ierr);
+void mpi_type_vector__(int* count, int* blocklen, int* stride, int* old_type, int* newtype,  int* ierr);
+void mpi_type_create_vector__(int* count, int* blocklen, int* stride, int* old_type, int* newtype,  int* ierr);
+void mpi_type_hvector__(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype,  int* ierr);
+void mpi_type_create_hvector__(int* count, int* blocklen, MPI_Aint* stride, int* old_type, int* newtype,  int* ierr);
+void mpi_type_free__(int* datatype, int* ierr);
 void mpi_type_lb__(int* datatype, MPI_Aint * extent, int* ierr);
 void mpi_type_ub__(int* datatype, MPI_Aint * extent, int* ierr);
+void mpi_win_fence__( int* assert,  int* win, int* ierr);
+void mpi_win_free__( int* win, int* ierr);
+void mpi_win_create__( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr);
+void mpi_info_create__( int *info, int* ierr);
+void mpi_info_set__( int *info, char *key, char *value, int* ierr);
+void mpi_info_free__(int* info, int* ierr);
+void mpi_get__( int *origin_addr, int* origin_count, int* origin_datatype, int* target_rank,
+    MPI_Aint* target_disp, int* target_count, int* target_datatype, int* win, int* ierr);
 void mpi_error_string__(int* errorcode, char* string, int* resultlen, int* ierr);
 void mpi_sendrecv__(void* sendbuf, int* sendcount, int* sendtype, int* dst,
                 int* sendtag, void *recvbuf, int* recvcount,
                 int* recvtype, int* src, int* recvtag,
                 int* comm, MPI_Status* status, int* ierr);
 
+/********** Tracing **********/
+/* from smpi_instr.c */
+void TRACE_internal_smpi_set_category (const char *category);
+const char *TRACE_internal_smpi_get_category (void);
+void TRACE_smpi_collective_in(int rank, int root, const char *operation);
+void TRACE_smpi_collective_out(int rank, int root, const char *operation);
+void TRACE_smpi_computing_init(int rank);
+void TRACE_smpi_computing_out(int rank);
+void TRACE_smpi_computing_in(int rank);
 
 #endif