X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15e20854c41119eb6c28a5c60eee7df325ad20de..9e66dd72aafe17f731081ba7023875fef091a249:/src/smpi/bindings/smpi_pmpi_type.cpp

diff --git a/src/smpi/bindings/smpi_pmpi_type.cpp b/src/smpi/bindings/smpi_pmpi_type.cpp
index 7d3e0db66b..8176b32292 100644
--- a/src/smpi/bindings/smpi_pmpi_type.cpp
+++ b/src/smpi/bindings/smpi_pmpi_type.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -23,37 +23,26 @@ int PMPI_Type_free(MPI_Datatype * datatype)
 
 int PMPI_Type_size(MPI_Datatype datatype, int *size)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (size == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *size = static_cast<int>(datatype->size());
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, size)
+  *size = static_cast<int>(datatype->size());
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (size == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *size = static_cast<MPI_Count>(datatype->size());
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, size)
+  *size = static_cast<MPI_Count>(datatype->size());
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (lb == nullptr || extent == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    return datatype->extent(lb, extent);
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, lb)
+  CHECK_NULL(3, MPI_ERR_ARG, extent)
+  return datatype->extent(lb, extent);
 }
 
 int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent)
@@ -63,96 +52,66 @@ int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * e
 
 int PMPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (extent == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *extent = datatype->get_extent();
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, extent)
+  *extent = datatype->get_extent();
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (disp == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *disp = datatype->lb();
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, disp)
+  *disp = datatype->lb();
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp)
 {
-  if (datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (disp == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *disp = datatype->ub();
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, disp)
+  *disp = datatype->ub();
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_dup(MPI_Datatype datatype, MPI_Datatype *newtype){
   int retval = MPI_SUCCESS;
-  if (datatype == MPI_DATATYPE_NULL) {
-    retval=MPI_ERR_TYPE;
-  } else {
-    *newtype = new simgrid::smpi::Datatype(datatype, &retval);
-    //error when duplicating, free the new datatype
-    if(retval!=MPI_SUCCESS){
-      simgrid::smpi::Datatype::unref(*newtype);
-      *newtype = MPI_DATATYPE_NULL;
-    }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  *newtype = new simgrid::smpi::Datatype(datatype, &retval);
+  //error when duplicating, free the new datatype
+  if(retval!=MPI_SUCCESS){
+    simgrid::smpi::Datatype::unref(*newtype);
+    *newtype = MPI_DATATYPE_NULL;
   }
   return retval;
 }
 
 int PMPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    return simgrid::smpi::Datatype::create_contiguous(count, old_type, 0, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(2, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  CHECK_NULL(3, MPI_ERR_ARG, new_type)
+  return simgrid::smpi::Datatype::create_contiguous(count, old_type, 0, new_type);
 }
 
 int PMPI_Type_commit(MPI_Datatype* datatype) {
-  if (datatype == nullptr || *datatype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else {
-    (*datatype)->commit();
-    return MPI_SUCCESS;
-  }
+  CHECK_NULL(1, MPI_ERR_ARG, datatype)
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, (*datatype))
+  (*datatype)->commit();
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else if(blocklen<0){
-    return MPI_ERR_ARG;
-  } else {
-    return simgrid::smpi::Datatype::create_vector(count, blocklen, stride, old_type, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_NEGATIVE(2, MPI_ERR_ARG, blocklen)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  return simgrid::smpi::Datatype::create_vector(count, blocklen, stride, old_type, new_type);
 }
 
 int PMPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else if(blocklen<0){
-    return MPI_ERR_ARG;
-  } else {
-    return simgrid::smpi::Datatype::create_hvector(count, blocklen, stride, old_type, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_NEGATIVE(2, MPI_ERR_ARG, blocklen)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  return simgrid::smpi::Datatype::create_hvector(count, blocklen, stride, old_type, new_type);
 }
 
 int PMPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* new_type) {
@@ -160,97 +119,75 @@ int PMPI_Type_create_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datat
 }
 
 int PMPI_Type_indexed(int count, const int* blocklens, const int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    return simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  return simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
 }
 
 int PMPI_Type_create_indexed(int count, const int* blocklens, const int* indices, MPI_Datatype old_type, MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    return simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  return simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
 }
 
 int PMPI_Type_create_indexed_block(int count, int blocklength, const int* indices, MPI_Datatype old_type,
                                    MPI_Datatype* new_type)
 {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count*sizeof(int)));
-    for (int i    = 0; i < count; i++)
-      blocklens[i]=blocklength;
-    int retval    = simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
-    xbt_free(blocklens);
-    return retval;
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  int* blocklens=static_cast<int*>(xbt_malloc(blocklength*count*sizeof(int)));
+  for (int i    = 0; i < count; i++)
+    blocklens[i]=blocklength;
+  int retval    = simgrid::smpi::Datatype::create_indexed(count, blocklens, indices, old_type, new_type);
+  xbt_free(blocklens);
+  return retval;
 }
 
-int PMPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* new_type)
+int PMPI_Type_hindexed(int count, const int* blocklens, const MPI_Aint* indices, MPI_Datatype old_type,
+                       MPI_Datatype* new_type)
 {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    return simgrid::smpi::Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  return simgrid::smpi::Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
 }
 
 int PMPI_Type_create_hindexed(int count, const int* blocklens, const MPI_Aint* indices, MPI_Datatype old_type,
                               MPI_Datatype* new_type) {
-  return PMPI_Type_hindexed(count, const_cast<int*>(blocklens),const_cast<MPI_Aint*>(indices),old_type,new_type);
+  return PMPI_Type_hindexed(count, blocklens, indices, old_type, new_type);
 }
 
 int PMPI_Type_create_hindexed_block(int count, int blocklength, const MPI_Aint* indices, MPI_Datatype old_type,
                                     MPI_Datatype* new_type) {
-  if (old_type == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  } else if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    int* blocklens=(int*)xbt_malloc(blocklength*count*sizeof(int));
-    for (int i     = 0; i < count; i++)
-      blocklens[i] = blocklength;
-    int retval     = simgrid::smpi::Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
-    xbt_free(blocklens);
-    return retval;
-  }
+  CHECK_COUNT(1, count)
+  CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_type)
+  int* blocklens=(int*)xbt_malloc(blocklength*count*sizeof(int));
+  for (int i     = 0; i < count; i++)
+    blocklens[i] = blocklength;
+  int retval     = simgrid::smpi::Datatype::create_hindexed(count, blocklens, indices, old_type, new_type);
+  xbt_free(blocklens);
+  return retval;
 }
 
-int PMPI_Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* new_type) {
-  if (count<0){
-    return MPI_ERR_COUNT;
-  } else {
-    for(int i=0; i<count; i++)
-      if(old_types[i]==MPI_DATATYPE_NULL)
-        return MPI_ERR_TYPE;
-    return simgrid::smpi::Datatype::create_struct(count, blocklens, indices, old_types, new_type);
-  }
+int PMPI_Type_struct(int count, const int* blocklens, const MPI_Aint* indices, const MPI_Datatype* old_types,
+                     MPI_Datatype* new_type)
+{
+  CHECK_COUNT(1, count)
+  for(int i=0; i<count; i++)
+    CHECK_MPI_NULL(4, MPI_DATATYPE_NULL, MPI_ERR_TYPE, old_types[i])
+  return simgrid::smpi::Datatype::create_struct(count, blocklens, indices, old_types, new_type);
 }
 
 int PMPI_Type_create_struct(int count, const int* blocklens, const MPI_Aint* indices, const MPI_Datatype* old_types,
                             MPI_Datatype* new_type) {
-  return PMPI_Type_struct(count, const_cast<int*>(blocklens), const_cast<MPI_Aint*>(indices), const_cast<MPI_Datatype*>(old_types), new_type);
+  return PMPI_Type_struct(count, blocklens, indices, old_types, new_type);
 }
 
 
 int PMPI_Type_create_subarray(int ndims, const int* array_of_sizes,
                              const int* array_of_subsizes, const int* array_of_starts,
                              int order, MPI_Datatype oldtype, MPI_Datatype *newtype) {
-  if (ndims<0){
-    return MPI_ERR_COUNT;
-  } else if (ndims==0){
+  CHECK_NEGATIVE(1, MPI_ERR_COUNT, ndims)
+  if (ndims==0){
     *newtype = MPI_DATATYPE_NULL;
     return MPI_SUCCESS;
   } else if (ndims==1){
@@ -266,67 +203,55 @@ int PMPI_Type_create_subarray(int ndims, const int* array_of_sizes,
 }
 
 int PMPI_Type_create_resized(MPI_Datatype oldtype,MPI_Aint lb, MPI_Aint extent, MPI_Datatype *newtype){
-  if (oldtype == MPI_DATATYPE_NULL) {
-    return MPI_ERR_TYPE;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, oldtype)
   return simgrid::smpi::Datatype::create_resized(oldtype, lb, extent, newtype);
 }
 
 
 int PMPI_Type_set_name(MPI_Datatype  datatype, const char * name)
 {
-  if (datatype == MPI_DATATYPE_NULL)  {
-    return MPI_ERR_TYPE;
-  } else if (name == nullptr)  {
-    return MPI_ERR_ARG;
-  } else {
-    datatype->set_name(name);
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, name)
+  datatype->set_name(name);
+  return MPI_SUCCESS;
 }
 
 int PMPI_Type_get_name(MPI_Datatype  datatype, char * name, int* len)
 {
-  if (datatype == MPI_DATATYPE_NULL)  {
-    return MPI_ERR_TYPE;
-  } else if (name == nullptr)  {
-    return MPI_ERR_ARG;
-  } else {
-    datatype->get_name(name, len);
-    return MPI_SUCCESS;
-  }
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, datatype)
+  CHECK_NULL(2, MPI_ERR_ARG, name)
+  datatype->get_name(name, len);
+  return MPI_SUCCESS;
 }
 
 MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype){
+  if(datatype==-1)
+    return MPI_DATATYPE_NULL;
   return static_cast<MPI_Datatype>(simgrid::smpi::F2C::f2c(datatype));
 }
 
 MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype){
+  if(datatype==MPI_DATATYPE_NULL)
+    return -1;
   return datatype->c2f();
 }
 
 int PMPI_Type_get_attr (MPI_Datatype type, int type_keyval, void *attribute_val, int* flag)
 {
-  if (type==MPI_DATATYPE_NULL)
-    return MPI_ERR_TYPE;
-  else
-    return type->attr_get<simgrid::smpi::Datatype>(type_keyval, attribute_val, flag);
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, type)
+  return type->attr_get<simgrid::smpi::Datatype>(type_keyval, attribute_val, flag);
 }
 
 int PMPI_Type_set_attr (MPI_Datatype type, int type_keyval, void *attribute_val)
 {
-  if (type==MPI_DATATYPE_NULL)
-    return MPI_ERR_TYPE;
-  else
-    return type->attr_put<simgrid::smpi::Datatype>(type_keyval, attribute_val);
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, type)
+  return type->attr_put<simgrid::smpi::Datatype>(type_keyval, attribute_val);
 }
 
 int PMPI_Type_delete_attr (MPI_Datatype type, int type_keyval)
 {
-  if (type==MPI_DATATYPE_NULL)
-    return MPI_ERR_TYPE;
-  else
-    return type->attr_delete<simgrid::smpi::Datatype>(type_keyval);
+  CHECK_MPI_NULL(1, MPI_DATATYPE_NULL, MPI_ERR_TYPE, type)
+  return type->attr_delete<simgrid::smpi::Datatype>(type_keyval);
 }
 
 int PMPI_Type_create_keyval(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval,
@@ -342,42 +267,29 @@ int PMPI_Type_free_keyval(int* keyval) {
 }
 
 int PMPI_Unpack(const void* inbuf, int incount, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) {
-  if(incount<0 || outcount < 0){
-    return MPI_ERR_COUNT;
-  } else if (inbuf==nullptr || outbuf==nullptr){
-    return MPI_ERR_ARG;
-  } else if (type == MPI_DATATYPE_NULL || not type->is_valid()){
-    return MPI_ERR_TYPE;
-  } else if(comm==MPI_COMM_NULL){
-    return MPI_ERR_COMM;
-  } else{
-    return type->unpack(inbuf, incount, position, outbuf,outcount, comm);
-  }
+  CHECK_NEGATIVE(2, MPI_ERR_COUNT, incount)
+  CHECK_NEGATIVE(5, MPI_ERR_COUNT, outcount)
+  CHECK_BUFFER(1, inbuf, incount)
+  CHECK_BUFFER(4, outbuf, outcount)
+  CHECK_TYPE(6, type)
+  CHECK_COMM(7)
+  return type->unpack(inbuf, incount, position, outbuf,outcount, comm);
 }
 
 int PMPI_Pack(const void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm) {
-  if(incount<0){
-    return MPI_ERR_COUNT;
-  } else if(inbuf==nullptr || outbuf==nullptr || outcount < 0){
-    return MPI_ERR_ARG;
-  } else if (type == MPI_DATATYPE_NULL || not type->is_valid()){
-    return MPI_ERR_TYPE;
-  } else if(comm==MPI_COMM_NULL){
-    return MPI_ERR_COMM;
-  } else {
-    return type->pack(inbuf == MPI_BOTTOM ? nullptr : inbuf, incount, outbuf, outcount, position, comm);
-  }
+  CHECK_NEGATIVE(2, MPI_ERR_COUNT, incount)
+  CHECK_NEGATIVE(5, MPI_ERR_COUNT, outcount)
+  CHECK_BUFFER(1, inbuf, incount)
+  CHECK_BUFFER(4, outbuf, outcount)
+  CHECK_TYPE(6, type)
+  CHECK_COMM(7)
+  return type->pack(inbuf == MPI_BOTTOM ? nullptr : inbuf, incount, outbuf, outcount, position, comm);
 }
 
 int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) {
-  if(incount<0){
-    return MPI_ERR_COUNT;
-  } else if (datatype == MPI_DATATYPE_NULL || not datatype->is_valid()){
-    return MPI_ERR_TYPE;
-  } else if(comm==MPI_COMM_NULL){
-    return MPI_ERR_COMM;
-  } else {
-    *size=incount*datatype->size();
-    return MPI_SUCCESS;
-  }
+  CHECK_NEGATIVE(1, MPI_ERR_COUNT, incount)
+  CHECK_TYPE(2, datatype)
+  CHECK_COMM(3)
+  *size=incount*datatype->size();
+  return MPI_SUCCESS;
 }