X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a502d5fb8c88cf5bcc86f16845ea346620161eac..6b9a59680b27bbe789336585bd00be1fae84d9a7:/src/smpi/private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index a53d6dcfa2..2f0d57d221 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -22,20 +22,52 @@ typedef struct s_smpi_process_data *smpi_process_data_t;
 #define NON_PERSISTENT 0x2
 #define SEND           0x4
 #define RECV           0x8
+#define RECV_DELETE     0x10
+
+// 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)
+typedef struct s_smpi_subtype{
+  void (*serialize)(const void * input, void *output, size_t count, void* subtype);
+  void (*unserialize)(const void * input, void *output, size_t count, void* subtype);
+  void (*subtype_free)(MPI_Datatype* type);
+} s_smpi_subtype_t;
+
+typedef struct s_smpi_mpi_datatype{
+  size_t size;
+  /* this let us know if a serialization is required*/
+  size_t has_subtype;
+  MPI_Aint lb;
+  MPI_Aint ub;
+  int flags;
+  /* this let us know how to serialize and unserialize*/
+  void *substruct;
+} s_smpi_mpi_datatype_t;
+
+//*****************************************************************************************
 
 typedef struct s_smpi_mpi_request {
   void *buf;
+  /* in the case of non-contignous memory the user address shoud be keep
+   * to unserialize the data inside the user memory*/
+  void *old_buf;
+  /* this let us know how tounserialize at the end of
+   * the communication*/
+  MPI_Datatype old_type;
   size_t size;
-  size_t contiguous;
-  size_t block_stride;
-  size_t block_length;
-  size_t block_count:
   int src;
   int dst;
   int tag;
+  //to handle cases where we have an unknown sender
+  //We can't override src, tag, and size, because the request may be reused later
+  int real_src;
+  int real_tag;
+  int truncated;
+  size_t real_size;
   MPI_Comm comm;
   smx_action_t action;
   unsigned flags;
+  int detached;
 #ifdef HAVE_TRACING
   int send;
   int recv;
@@ -65,14 +97,11 @@ void smpi_global_init(void);
 void smpi_global_destroy(void);
 
 size_t smpi_datatype_size(MPI_Datatype datatype);
-size_t smpi_datatype_contiguous(MPI_Datatype datatype);
-size_t smpi_datatype_block_stride(MPI_Datatype datatype);
-size_t smpi_datatype_block_length(MPI_Datatype datatype);
-size_t smpi_datatype_block_count(MPI_Datatype datatype);
 MPI_Aint smpi_datatype_lb(MPI_Datatype datatype);
 MPI_Aint smpi_datatype_ub(MPI_Datatype datatype);
 int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
                          MPI_Aint * extent);
+MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype);
 int smpi_datatype_copy(void *sendbuf, int sendcount, MPI_Datatype sendtype,
                        void *recvbuf, int recvcount,
                        MPI_Datatype recvtype);
@@ -89,12 +118,14 @@ int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices,
                      MPI_Datatype old_type, MPI_Datatype* new_type);
 int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices,
                     MPI_Datatype* old_types, MPI_Datatype* new_type);
-void smpi_datatype_create(MPI_Datatype* new_type, int size, int flags);
-void smpi_datatype_free(MPI_Datatype* type);
-void smpi_datatype_commit(MPI_Datatype* datatype);
 
+void smpi_datatype_create(MPI_Datatype* new_type, int size,int lb, int ub, int has_subtype, void *struct_type, int flags);
 
 
+void smpi_datatype_free(MPI_Datatype* type);
+void smpi_datatype_commit(MPI_Datatype* datatype);
+
+void smpi_empty_status(MPI_Status * status);
 MPI_Op smpi_op_new(MPI_User_function * function, int commute);
 void smpi_op_destroy(MPI_Op op);
 void smpi_op_apply(MPI_Op op, void *invec, void *inoutvec, int *len,
@@ -147,16 +178,18 @@ int smpi_mpi_testany(int count, MPI_Request requests[], int *index,
 int smpi_mpi_testall(int count, MPI_Request requests[],
                      MPI_Status status[]);
 void smpi_mpi_probe(int source, int tag, MPI_Comm comm, MPI_Status* status);
-MPI_Request smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag,
+void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag,
                     MPI_Status* status);
 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[]);
+int smpi_mpi_testsome(int incount, MPI_Request requests[], int *indices,
+                      MPI_Status status[]);
 void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root,
                     MPI_Comm comm);
 void smpi_mpi_barrier(MPI_Comm comm);
@@ -224,6 +257,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);
@@ -253,17 +287,36 @@ void mpi_reduce__(void* sendbuf, void* recvbuf, int* count,
 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, 
+                   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_gatherv__(void* sendbuf, int* sendcount, int* sendtype,
+                  void* recvbuf, int* recvcounts, int* displs, 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_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);
+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);
+
 
 #endif