X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e791988d14b020b847a39f72da8062fea90bb3b5..61fc507b7dde640d3bd7d4818d15674436c34f97:/teshsuite/smpi/coll-gather/coll-gather.c

diff --git a/teshsuite/smpi/coll-gather/coll-gather.c b/teshsuite/smpi/coll-gather/coll-gather.c
index 52e0068e68..be0ae6aeb4 100644
--- a/teshsuite/smpi/coll-gather/coll-gather.c
+++ b/teshsuite/smpi/coll-gather/coll-gather.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,15 +10,10 @@
 #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 rank;
+  int size;
   int status;
 
   int root = 0;
@@ -26,36 +21,56 @@ int main(int argc, char *argv[])
   MPI_Init(&argc, &argv);
   MPI_Comm_rank(MPI_COMM_WORLD, &rank);
   MPI_Comm_size(MPI_COMM_WORLD, &size);
+  MPI_Comm_set_errhandler(MPI_COMM_WORLD, MPI_ERRORS_RETURN);
 
   int count = 2;
-  sb = (int *) xbt_malloc(count * sizeof(int));
-  rb = (int *) xbt_malloc(count * size * sizeof(int));
-  
-  for (i = 0; i < count; ++i)
+  int* sb = (int *) xbt_malloc(count * sizeof(int));
+  int* rb = (int *) xbt_malloc(count * size * sizeof(int));
+
+  for (int i = 0; i < count; ++i)
     sb[i] = rank * count + i;
-  for (i = 0; i < count * size; ++i)  
+  for (int i = 0; i < count * size; ++i)
     rb[i] = 0;
 
   printf("[%d] sndbuf=[", rank);
-  for (i = 0; i < count; i++)
+  for (int i = 0; i < count; i++)
     printf("%d ", sb[i]);
   printf("]\n");
 
+  status = MPI_Gather(NULL, count, MPI_INT, rb, count, MPI_INT, root, MPI_COMM_WORLD);
+  if(status!=MPI_ERR_BUFFER)
+    printf("MPI_Gather did not return MPI_ERR_BUFFER for empty sendbuf\n");
+  status = MPI_Gather(sb, -1, MPI_INT, rb, count, MPI_INT, root, MPI_COMM_WORLD);
+  if(status!=MPI_ERR_COUNT)
+    printf("MPI_Gather did not return MPI_ERR_COUNT for -1 sendcount\n");
+  status = MPI_Gather(sb, count, MPI_DATATYPE_NULL, rb, count, MPI_INT, root, MPI_COMM_WORLD);
+  if(status!=MPI_ERR_TYPE)
+    printf("MPI_Gather did not return MPI_ERR_TYPE for MPI_DATATYPE_NULL sendtype\n");
+  status = MPI_Gather(sb, count, MPI_INT, rb, count, MPI_INT, -1, MPI_COMM_WORLD);
+  if(status!=MPI_ERR_ROOT)
+    printf("MPI_Gather did not return MPI_ERR_ROOT for root -1\n");
+  status = MPI_Gather(sb, count, MPI_INT, rb, count, MPI_INT, size+1, MPI_COMM_WORLD);
+  if(status!=MPI_ERR_ROOT)
+    printf("MPI_Gather did not return MPI_ERR_ROOT for root > size\n");
+  status = MPI_Gather(sb, count, MPI_INT, rb, count, MPI_INT, root, MPI_COMM_NULL);
+  if(status!=MPI_ERR_COMM)
+    printf("MPI_Gather did not return MPI_ERR_COMM for MPI_COMM_NULL comm\n");
+
   status = MPI_Gather(sb, count, MPI_INT, rb, count, MPI_INT, root, MPI_COMM_WORLD);
 
   if (rank == root) {
     printf("[%d] rcvbuf=[", rank);
-    for (i = 0; i < count * size; i++)
+    for (int i = 0; i < count * size; i++)
       printf("%d ", rb[i]);
     printf("]\n");
 
     if (status != MPI_SUCCESS) {
-      printf("allgather returned %d\n", status);
+      printf("gather returned %d\n", status);
       fflush(stdout);
     }
   }
-  free(sb);
-  free(rb);
+  xbt_free(sb);
+  xbt_free(rb);
   MPI_Barrier(MPI_COMM_WORLD);
   MPI_Finalize();
   return (EXIT_SUCCESS);