X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84ab3c04b80eac4aa5177ec40a145c2e345bdb29..149c63f36e15b8500b1e826bda5138318ff7ba2b:/src/smpi/bindings/smpi_pmpi_group.cpp

diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp
index 83b08ed2d7..5a7932a23a 100644
--- a/src/smpi/bindings/smpi_pmpi_group.cpp
+++ b/src/smpi/bindings/smpi_pmpi_group.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. */
@@ -16,168 +16,125 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
 
 int PMPI_Group_free(MPI_Group * group)
 {
-  if (group == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    if(*group != MPI_COMM_WORLD->group() && *group != MPI_GROUP_EMPTY)
-      simgrid::smpi::Group::unref(*group);
-    *group = MPI_GROUP_NULL;
-    return MPI_SUCCESS;
-  }
+  CHECK_NULL(1, MPI_ERR_ARG, group)
+  if(*group != MPI_COMM_WORLD->group() && *group != MPI_GROUP_EMPTY)
+    simgrid::smpi::Group::unref(*group);
+  *group = MPI_GROUP_NULL;
+  return MPI_SUCCESS;
 }
 
 int PMPI_Group_size(MPI_Group group, int *size)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (size == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *size = group->size();
-    return MPI_SUCCESS;
-  }
+  CHECK_GROUP(1, group)
+  CHECK_NULL(2, MPI_ERR_ARG, size)
+  *size = group->size();
+  return MPI_SUCCESS;
 }
 
 int PMPI_Group_rank(MPI_Group group, int *rank)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (rank == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *rank = group->rank(simgrid::s4u::this_actor::get_pid());
-    return MPI_SUCCESS;
-  }
+  CHECK_GROUP(1, group)
+  CHECK_NULL(2, MPI_ERR_ARG, rank)
+  *rank = group->rank(simgrid::s4u::this_actor::get_pid());
+  return MPI_SUCCESS;
 }
 
 int PMPI_Group_translate_ranks(MPI_Group group1, int n, const int *ranks1, MPI_Group group2, int *ranks2)
 {
-  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else {
-    for (int i = 0; i < n; i++) {
-      if(ranks1[i]==MPI_PROC_NULL){
-        ranks2[i]=MPI_PROC_NULL;
-      }else{
-        simgrid::s4u::ActorPtr actor = group1->actor(ranks1[i]);
-        ranks2[i] = group2->rank(actor);
-      }
+  CHECK_GROUP(1, group1)
+  CHECK_GROUP(4, group2)
+  for (int i = 0; i < n; i++) {
+    if(ranks1[i]==MPI_PROC_NULL){
+      ranks2[i]=MPI_PROC_NULL;
+    }else{
+      simgrid::s4u::Actor* actor = group1->actor(ranks1[i]);
+      ranks2[i] = group2->rank(actor);
     }
-    return MPI_SUCCESS;
   }
+  return MPI_SUCCESS;
 }
 
 int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result)
 {
-  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (result == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    *result = group1->compare(group2);
-    return MPI_SUCCESS;
-  }
+  CHECK_GROUP(1, group1)
+  CHECK_GROUP(2, group2)
+  CHECK_NULL(3, MPI_ERR_ARG, result)
+  *result = group1->compare(group2);
+  return MPI_SUCCESS;
 }
 
 int PMPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
 {
-
-  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    return group1->group_union(group2, newgroup);
-  }
+  CHECK_GROUP(1, group1)
+  CHECK_GROUP(2, group2)
+  CHECK_NULL(3, MPI_ERR_ARG, newgroup)
+  return group1->group_union(group2, newgroup);
 }
 
 int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
 {
-
-  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    return group1->intersection(group2,newgroup);
-  }
+  CHECK_GROUP(1, group1)
+  CHECK_GROUP(2, group2)
+  CHECK_NULL(3, MPI_ERR_ARG, newgroup)
+  return group1->intersection(group2,newgroup);
 }
 
 int PMPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
 {
-  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    return group1->difference(group2,newgroup);
-  }
+  CHECK_GROUP(1, group1)
+  CHECK_GROUP(2, group2)
+  CHECK_NULL(3, MPI_ERR_ARG, newgroup)
+  return group1->difference(group2,newgroup);
 }
 
 int PMPI_Group_incl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
-  } else {
-    return group->incl(n, ranks, newgroup);
-  }
+  CHECK_GROUP(1, group)
+  CHECK_NULL(4, MPI_ERR_ARG, newgroup)
+  return group->incl(n, ranks, newgroup);
 }
 
 int PMPI_Group_excl(MPI_Group group, int n, const int *ranks, MPI_Group * newgroup)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
+  CHECK_GROUP(1, group)
+  CHECK_NULL(4, MPI_ERR_ARG, newgroup)
+  if (n == 0) {
+    *newgroup = group;
+    if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY)
+      group->ref();
+    return MPI_SUCCESS;
+  } else if (n == group->size()) {
+    *newgroup = MPI_GROUP_EMPTY;
+    return MPI_SUCCESS;
   } else {
-    if (n == 0) {
-      *newgroup = group;
-      if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY)
-        group->ref();
-      return MPI_SUCCESS;
-    } else if (n == group->size()) {
-      *newgroup = MPI_GROUP_EMPTY;
-      return MPI_SUCCESS;
-    } else {
-      return group->excl(n,ranks,newgroup);
-    }
+    return group->excl(n,ranks,newgroup);
   }
 }
 
 int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
+  CHECK_GROUP(1, group)
+  CHECK_NULL(4, MPI_ERR_ARG, newgroup)
+  if (n == 0) {
+    *newgroup = MPI_GROUP_EMPTY;
+    return MPI_SUCCESS;
   } else {
-    if (n == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-      return MPI_SUCCESS;
-    } else {
-      return group->range_incl(n,ranges,newgroup);
-    }
+    return group->range_incl(n,ranges,newgroup);
   }
 }
 
 int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group * newgroup)
 {
-  if (group == MPI_GROUP_NULL) {
-    return MPI_ERR_GROUP;
-  } else if (newgroup == nullptr) {
-    return MPI_ERR_ARG;
+  CHECK_GROUP(1, group)
+  CHECK_NULL(4, MPI_ERR_ARG, newgroup)
+  if (n == 0) {
+    *newgroup = group;
+    if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() &&
+        group != MPI_GROUP_EMPTY)
+      group->ref();
+    return MPI_SUCCESS;
   } else {
-    if (n == 0) {
-      *newgroup = group;
-      if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() &&
-          group != MPI_GROUP_EMPTY)
-        group->ref();
-      return MPI_SUCCESS;
-    } else {
-      return group->range_excl(n,ranges,newgroup);
-    }
+    return group->range_excl(n,ranges,newgroup);
   }
 }