X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa64b0469b0967780beb549867c2907c14525443..ccedb07575381e28a3143247e9028fe4f73bcd96:/src/smpi/private.h?ds=sidebyside

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 0f2487e501..71a9ec831e 100644
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -11,7 +11,9 @@
 #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"
 
@@ -24,26 +26,15 @@ typedef struct s_smpi_process_data *smpi_process_data_t;
 #define RECV           0x8
 
 
-//*****************************************************************************************
-
 // 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;
 
-/*one exemple of implementation for the vector is already here*/
-typedef struct s_smpi_mpi_vector{
-  s_smpi_subtype_t base;
-  size_t block_stride;
-  size_t block_length;
-  size_t block_count;
-  MPI_Datatype old_type;
-  size_t size_oldtype;
-} s_smpi_mpi_vector_t;
-
 typedef struct s_smpi_mpi_datatype{
   size_t size;
   /* this let us know if a serialization is required*/
@@ -55,7 +46,6 @@ typedef struct s_smpi_mpi_datatype{
   void *substruct;
 } s_smpi_mpi_datatype_t;
 
-
 //*****************************************************************************************
 
 typedef struct s_smpi_mpi_request {
@@ -73,6 +63,7 @@ typedef struct s_smpi_mpi_request {
   MPI_Comm comm;
   smx_action_t action;
   unsigned flags;
+  int detached;
 #ifdef HAVE_TRACING
   int send;
   int recv;
@@ -123,14 +114,13 @@ int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices,
 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 has_subtype, void *struct_type, int flags);
+void smpi_datatype_create(MPI_Datatype* new_type, int size,int realsize, 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,
@@ -183,7 +173,7 @@ 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);
@@ -193,6 +183,8 @@ void 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);