EXIT_SUCCESS/EXIT_FAILURE are standard C defined in stdlib.h.

[simgrid.git] / teshsuite / smpi / coll-allgatherv / coll-allgatherv.c

diff --git a/teshsuite/smpi/coll-allgatherv/coll-allgatherv.c b/teshsuite/smpi/coll-allgatherv/coll-allgatherv.c
index 1cbda3c..5bef95a 100644 (file)
--- a/teshsuite/smpi/coll-allgatherv/coll-allgatherv.c
+++ b/teshsuite/smpi/coll-allgatherv/coll-allgatherv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2013-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,11 +10,6 @@
 #include <errno.h>
 #include "mpi.h"
 
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#define EXIT_FAILURE 1
-#endif
-
 int main(int argc, char *argv[])
 {
   int i;
@@ -39,16 +34,16 @@ int main(int argc, char *argv[])
   int* sb = (int *) xbt_malloc(recv_counts[rank] * sizeof(int));
   int* rb = (int *) xbt_malloc(recv_sb_size * sizeof(int));
 
-  for (i = 0; i < recv_counts[rank]; ++i)
-    sb[i] = recv_disps[rank] + i;
-  for (i = 0; i < recv_sb_size; ++i)
-    rb[i] = -1;
-
   printf("[%d] sndbuf=[", rank);
-  for (i = 0; i < recv_counts[rank]; i++)
+  for (i = 0; i < recv_counts[rank]; i++){
+    sb[i] = recv_disps[rank] + i;
     printf("%d ", sb[i]);
+  }
   printf("]\n");
 
+  for (i = 0; i < recv_sb_size; i++)
+    rb[i] = -1;
+
   status = MPI_Allgatherv(sb, recv_counts[rank], MPI_INT, rb, recv_counts, recv_disps, MPI_INT, MPI_COMM_WORLD);
 
   printf("[%d] rcvbuf=[", rank);
@@ -56,11 +51,9 @@ int main(int argc, char *argv[])
     printf("%d ", rb[i]);
   printf("]\n");
 
-  if (rank == 0) {
-    if (status != MPI_SUCCESS) {
-      printf("allgatherv returned %d\n", status);
-      fflush(stdout);
-    }
+  if (rank == 0 && status != MPI_SUCCESS) {
+    printf("allgatherv returned %d\n", status);
+    fflush(stdout);
   }
   xbt_free(sb);
   xbt_free(rb);