X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..b8df87e176f27b25534f27d7e240defa32ca35bc:/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 97ef03e142..852dba3aef 100644
--- 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-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,46 +10,40 @@
 #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,rank, size;
-  int *sb, *rb;
-  int *recv_counts, *recv_disps;
-  int recv_sb_size;
+  int i;
+  int rank;
+  int size;
   int status;
 
   MPI_Init(&argc, &argv);
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   MPI_Comm_size(MPI_COMM_WORLD, &size);
 
-  recv_counts = (int *) xbt_malloc(size * sizeof(int));
-  recv_disps = (int *) xbt_malloc(size * sizeof(int));
+  int* recv_counts = (int *) xbt_malloc(size * sizeof(int));
+  int* recv_disps = (int *) xbt_malloc(size * sizeof(int));
 
-  recv_sb_size = 0;
+  int recv_sb_size = 0;
   for (i = 0; i < size; i++) {
     recv_counts[i] = i + 1;
     recv_disps[i] = recv_sb_size;
     recv_sb_size += i + 1;
   }
 
-  sb = (int *) xbt_malloc(recv_counts[rank] * sizeof(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;
+  int* sb = (int *) xbt_malloc(recv_counts[rank] * sizeof(int));
+  int* rb = (int *) xbt_malloc(recv_sb_size * sizeof(int));
 
   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);
@@ -57,16 +51,14 @@ 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);
   }
-  free(sb);
-  free(rb);
-  free(recv_counts);
-  free(recv_disps);
+  xbt_free(sb);
+  xbt_free(rb);
+  xbt_free(recv_counts);
+  xbt_free(recv_disps);
   MPI_Finalize();
   return (EXIT_SUCCESS);
 }