X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45c3f1cfee86fb48c96d53f8267f99b6db6e3d7a..e9f0018b823e34405847177b25a85d3facc30ae1:/src/smpi/smpi_mpi_dt_private.h diff --git a/src/smpi/smpi_mpi_dt_private.h b/src/smpi/smpi_mpi_dt_private.h index 6e81df3521..79822efded 100644 --- a/src/smpi/smpi_mpi_dt_private.h +++ b/src/smpi/smpi_mpi_dt_private.h @@ -9,6 +9,8 @@ #ifndef SMPI_DT_PRIVATE_H #define SMPI_DT_PRIVATE_H +#include + #include "private.h" #define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */ @@ -30,7 +32,7 @@ */ #define DT_FLAG_BASIC (DT_FLAG_PREDEFINED | DT_FLAG_CONTIGUOUS | DT_FLAG_NO_GAPS | DT_FLAG_DATA | DT_FLAG_COMMITED) -extern MPI_Datatype MPI_PTR; +extern const MPI_Datatype MPI_PTR; //***************************************************************************************** @@ -45,16 +47,16 @@ typedef struct s_smpi_mpi_contiguous{ MPI_Datatype old_type; MPI_Aint lb; size_t size_oldtype; - size_t block_count; + int block_count; } s_smpi_mpi_contiguous_t; typedef struct s_smpi_mpi_vector{ s_smpi_subtype_t base; MPI_Datatype old_type; size_t size_oldtype; - size_t block_stride; - size_t block_length; - size_t block_count; + int block_stride; + int block_length; + int block_count; } s_smpi_mpi_vector_t; typedef struct s_smpi_mpi_hvector{ @@ -62,8 +64,8 @@ typedef struct s_smpi_mpi_hvector{ MPI_Datatype old_type; size_t size_oldtype; MPI_Aint block_stride; - size_t block_length; - size_t block_count; + int block_length; + int block_count; } s_smpi_mpi_hvector_t; typedef struct s_smpi_mpi_indexed{ @@ -72,7 +74,7 @@ typedef struct s_smpi_mpi_indexed{ size_t size_oldtype; int* block_lengths; int* block_indices; - size_t block_count; + int block_count; } s_smpi_mpi_indexed_t; typedef struct s_smpi_mpi_hindexed{ @@ -81,7 +83,7 @@ typedef struct s_smpi_mpi_hindexed{ size_t size_oldtype; int* block_lengths; MPI_Aint* block_indices; - size_t block_count; + int block_count; } s_smpi_mpi_hindexed_t; typedef struct s_smpi_mpi_struct{ @@ -90,7 +92,7 @@ typedef struct s_smpi_mpi_struct{ size_t size_oldtype; int* block_lengths; MPI_Aint* block_indices; - size_t block_count; + int block_count; MPI_Datatype* old_types; } s_smpi_mpi_struct_t; @@ -98,109 +100,115 @@ typedef struct s_smpi_mpi_struct{ Functions to handle serialization/unserialization of messages, 3 for each type of MPI_Type One for creating the substructure to handle, one for serialization, one for unserialization */ -void unserialize_contiguous( const void *contiguous_vector, +XBT_PRIVATE void unserialize_contiguous( const void *contiguous_vector, void *noncontiguous_vector, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_contiguous( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_contiguous( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_contiguous(MPI_Datatype* type); +XBT_PRIVATE void free_contiguous(MPI_Datatype* type); -s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, +XBT_PRIVATE s_smpi_mpi_contiguous_t* smpi_datatype_contiguous_create( MPI_Aint lb, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_vector( const void *contiguous_vector, +XBT_PRIVATE void unserialize_vector( const void *contiguous_vector, void *noncontiguous_vector, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_vector( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_vector( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_vector(MPI_Datatype* type); +XBT_PRIVATE void free_vector(MPI_Datatype* type); -s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, +XBT_PRIVATE s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride, int block_length, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_hvector( const void *contiguous_vector, +XBT_PRIVATE void unserialize_hvector( const void *contiguous_vector, void *noncontiguous_vector, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_hvector( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_hvector( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_hvector(MPI_Datatype* type); +XBT_PRIVATE void free_hvector(MPI_Datatype* type); -s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, +XBT_PRIVATE s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride, int block_length, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_indexed( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_indexed( const void *contiguous_indexed, void *noncontiguous_indexed, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_indexed( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_indexed( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_indexed(MPI_Datatype* type); +XBT_PRIVATE void free_indexed(MPI_Datatype* type); -s_smpi_mpi_indexed_t* smpi_datatype_indexed_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_indexed_t* smpi_datatype_indexed_create(int* block_lengths, int* block_indices, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_hindexed( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_hindexed( const void *contiguous_indexed, void *noncontiguous_indexed, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_hindexed( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_hindexed( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_hindexed(MPI_Datatype* type); +XBT_PRIVATE void free_hindexed(MPI_Datatype* type); -s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create(int* block_lengths, MPI_Aint* block_indices, int block_count, MPI_Datatype old_type, int size_oldtype); -void unserialize_struct( const void *contiguous_indexed, +XBT_PRIVATE void unserialize_struct( const void *contiguous_indexed, void *noncontiguous_indexed, - size_t count, - void *type); + int count, + void *type, + MPI_Op op); -void serialize_struct( const void *noncontiguous_vector, +XBT_PRIVATE void serialize_struct( const void *noncontiguous_vector, void *contiguous_vector, - size_t count, + int count, void *type); -void free_struct(MPI_Datatype* type); +XBT_PRIVATE void free_struct(MPI_Datatype* type); -s_smpi_mpi_struct_t* smpi_datatype_struct_create(int* block_lengths, +XBT_PRIVATE s_smpi_mpi_struct_t* smpi_datatype_struct_create(int* block_lengths, MPI_Aint* block_indices, int block_count, MPI_Datatype* old_types);