add MPI_PACKED datatype (for compilation only, MPI_Pack and Unpack functions are...

[simgrid.git] / src / smpi / smpi_mpi_dt.c

diff --git a/src/smpi/smpi_mpi_dt.c b/src/smpi/smpi_mpi_dt.c
index d5a1421..5e22c33 100644 (file)
--- a/src/smpi/smpi_mpi_dt.c
+++ b/src/smpi/smpi_mpi_dt.c
@@ -105,6 +105,7 @@ CREATE_MPI_DATATYPE(MPI_LONG_DOUBLE_INT, long_double_int);
 
 CREATE_MPI_DATATYPE_NULL(MPI_UB);
 CREATE_MPI_DATATYPE_NULL(MPI_LB);
+CREATE_MPI_DATATYPE_NULL(MPI_PACKED);
 // Internal use only
 CREATE_MPI_DATATYPE(MPI_PTR, void*);
 
@@ -257,6 +258,7 @@ s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride,
   s_smpi_mpi_vector_t *new_t= xbt_new(s_smpi_mpi_vector_t,1);
   new_t->base.serialize = &serialize_vector;
   new_t->base.unserialize = &unserialize_vector;
+  new_t->base.subtype_free = &free_vector;
   new_t->block_stride = block_stride;
   new_t->block_length = block_length;
   new_t->block_count = block_count;
@@ -265,19 +267,22 @@ s_smpi_mpi_vector_t* smpi_datatype_vector_create( int block_stride,
   return new_t;
 }
 
-void smpi_datatype_create(MPI_Datatype* new_type, int size, int has_subtype,
+void smpi_datatype_create(MPI_Datatype* new_type, int size,int extent, int has_subtype,
                           void *struct_type, int flags){
   MPI_Datatype new_t= xbt_new(s_smpi_mpi_datatype_t,1);
   new_t->size = size;
   new_t->has_subtype = has_subtype;
   new_t->lb = 0;
-  new_t->ub = size;
+  new_t->ub = extent;
   new_t->flags = flags;
   new_t->substruct = struct_type;
   *new_type = new_t;
 }
 
 void smpi_datatype_free(MPI_Datatype* type){
+  if ((*type)->has_subtype == 1){
+    ((s_smpi_subtype_t *)(*type)->substruct)->subtype_free(type);  
+  }
   xbt_free(*type);
 }
 
@@ -288,6 +293,7 @@ int smpi_datatype_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new
     retval = MPI_ERR_TYPE;
   } else {
     smpi_datatype_create(new_type, count *
+                         smpi_datatype_size(old_type),count *
                          smpi_datatype_size(old_type),0,NULL, DT_FLAG_CONTIGUOUS);
     retval=MPI_SUCCESS;
   }
@@ -312,6 +318,7 @@ if (old_type->has_subtype == 1)
 
       smpi_datatype_create(new_type, count * (blocklen) *
                            smpi_datatype_size(old_type),
+                          ((count -1) * stride + blocklen) * smpi_datatype_size(old_type),
                            1,
                            subtype,
                            DT_FLAG_VECTOR);
@@ -320,6 +327,7 @@ if (old_type->has_subtype == 1)
       /* in this situation the data are contignous thus it's not
        * required to serialize and unserialize it*/
       smpi_datatype_create(new_type, count * blocklen *
+                           smpi_datatype_size(old_type), ((count -1) * stride + blocklen)*
                            smpi_datatype_size(old_type),
                            0,
                            NULL,
@@ -330,7 +338,8 @@ if (old_type->has_subtype == 1)
   return retval;
 }
 
-
+void free_vector(MPI_Datatype* d){
+}
 
 /*
 Hvector Implementation - Vector with stride in bytes
@@ -407,6 +416,7 @@ s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride,
   s_smpi_mpi_hvector_t *new_t= xbt_new(s_smpi_mpi_hvector_t,1);
   new_t->base.serialize = &serialize_hvector;
   new_t->base.unserialize = &unserialize_hvector;
+  new_t->base.subtype_free = &free_hvector;
   new_t->block_stride = block_stride;
   new_t->block_length = block_length;
   new_t->block_count = block_count;
@@ -415,6 +425,10 @@ s_smpi_mpi_hvector_t* smpi_datatype_hvector_create( MPI_Aint block_stride,
   return new_t;
 }
 
+//do nothing for vector types
+void free_hvector(MPI_Datatype* d){
+}
+
 int smpi_datatype_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type)
 {
   int retval;
@@ -432,6 +446,7 @@ if (old_type->has_subtype == 1)
                                                                     smpi_datatype_size(old_type));
 
       smpi_datatype_create(new_type, count * blocklen *
+                           smpi_datatype_size(old_type), (count-1) * stride + blocklen *
                            smpi_datatype_size(old_type),
                            1,
                            subtype,
@@ -439,6 +454,7 @@ if (old_type->has_subtype == 1)
       retval=MPI_SUCCESS;
     }else{
       smpi_datatype_create(new_type, count * blocklen *
+                                               smpi_datatype_size(old_type),count * blocklen *
                                                smpi_datatype_size(old_type),
                                               0,
                                               NULL,
@@ -516,6 +532,11 @@ void unserialize_indexed( const void *contiguous_indexed,
   }
 }
 
+void free_indexed(MPI_Datatype* type){
+  xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_lengths);
+  xbt_free(((s_smpi_mpi_indexed_t *)(*type)->substruct)->block_indices);
+}
+
 /*
  * Create a Sub type indexed to be able to serialize and unserialize it
  * the structure s_smpi_mpi_indexed_t is derived from s_smpi_subtype which
@@ -529,6 +550,7 @@ s_smpi_mpi_indexed_t* smpi_datatype_indexed_create( int* block_lengths,
   s_smpi_mpi_indexed_t *new_t= xbt_new(s_smpi_mpi_indexed_t,1);
   new_t->base.serialize = &serialize_indexed;
   new_t->base.unserialize = &unserialize_indexed;
+  new_t->base.subtype_free = &free_indexed;
  //TODO : add a custom function for each time to clean these 
   new_t->block_lengths= xbt_new(int, block_count);
   new_t->block_indices= xbt_new(int, block_count);
@@ -572,9 +594,10 @@ int smpi_datatype_indexed(int count, int* blocklens, int* indices, MPI_Datatype
                                                                     smpi_datatype_size(old_type));
 
       smpi_datatype_create(new_type,  size *
-                           smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA);
+                           smpi_datatype_size(old_type),(indices[count-1]+blocklens[count-1])*smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA);
 }else{
       smpi_datatype_create(new_type,  size *
+                           smpi_datatype_size(old_type),size *
                            smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
 }
     retval=MPI_SUCCESS;
@@ -649,6 +672,11 @@ void unserialize_hindexed( const void *contiguous_hindexed,
   }
 }
 
+void free_hindexed(MPI_Datatype* type){
+  xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_lengths);
+  xbt_free(((s_smpi_mpi_hindexed_t *)(*type)->substruct)->block_indices);
+}
+
 /*
  * Create a Sub type hindexed to be able to serialize and unserialize it
  * the structure s_smpi_mpi_hindexed_t is derived from s_smpi_subtype which
@@ -662,6 +690,7 @@ s_smpi_mpi_hindexed_t* smpi_datatype_hindexed_create( int* block_lengths,
   s_smpi_mpi_hindexed_t *new_t= xbt_new(s_smpi_mpi_hindexed_t,1);
   new_t->base.serialize = &serialize_hindexed;
   new_t->base.unserialize = &unserialize_hindexed;
+  new_t->base.subtype_free = &free_hindexed;
  //TODO : add a custom function for each time to clean these 
   new_t->block_lengths= xbt_new(int, block_count);
   new_t->block_indices= xbt_new(MPI_Aint, block_count);
@@ -705,9 +734,11 @@ int smpi_datatype_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Dat
                                                                     smpi_datatype_size(old_type));
 
       smpi_datatype_create(new_type,  size *
-                           smpi_datatype_size(old_type),1, subtype, DT_FLAG_DATA);
+                           smpi_datatype_size(old_type),indices[count-1]+blocklens[count-1]*smpi_datatype_size(old_type)
+                           ,1, subtype, DT_FLAG_DATA);
     }else{
       smpi_datatype_create(new_type,  size *
+                           smpi_datatype_size(old_type),size *
                            smpi_datatype_size(old_type),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
     }
     retval=MPI_SUCCESS;
@@ -781,6 +812,12 @@ void unserialize_struct( const void *contiguous_struct,
   }
 }
 
+void free_struct(MPI_Datatype* type){
+  xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_lengths);
+  xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->block_indices);
+  xbt_free(((s_smpi_mpi_struct_t *)(*type)->substruct)->old_types);
+}
+
 /*
  * Create a Sub type struct to be able to serialize and unserialize it
  * the structure s_smpi_mpi_struct_t is derived from s_smpi_subtype which
@@ -793,6 +830,7 @@ s_smpi_mpi_struct_t* smpi_datatype_struct_create( int* block_lengths,
   s_smpi_mpi_struct_t *new_t= xbt_new(s_smpi_mpi_struct_t,1);
   new_t->base.serialize = &serialize_struct;
   new_t->base.unserialize = &unserialize_struct;
+  new_t->base.subtype_free = &free_struct;
  //TODO : add a custom function for each time to clean these 
   new_t->block_lengths= xbt_new(int, block_count);
   new_t->block_indices= xbt_new(MPI_Aint, block_count);
@@ -835,9 +873,9 @@ int smpi_datatype_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datat
                                                               count,
                                                               old_types);
 
-    smpi_datatype_create(new_type,  size ,1, subtype, DT_FLAG_DATA);
+    smpi_datatype_create(new_type,  size, indices[count-1] + blocklens[count-1]*smpi_datatype_size(old_types[count-1]),1, subtype, DT_FLAG_DATA);
   }else{
-    smpi_datatype_create(new_type,  size,0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
+    smpi_datatype_create(new_type,  size, indices[count-1] + blocklens[count-1]*smpi_datatype_size(old_types[count-1]),0, NULL, DT_FLAG_DATA|DT_FLAG_CONTIGUOUS);
   }
   return MPI_SUCCESS;
 }