Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / smpi / isp / umpire / basic-deadlock-intercomm_merge.c

diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c
index e936120..6054a7d 100644 (file)
--- a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c
+++ b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c
@@ -46,7 +46,7 @@ main (int argc, char **argv)
                            INTERCOMM_CREATE_TAG, &intercomm);
 
       MPI_Comm_free (&temp);
-      
+
       if (intercomm == MPI_COMM_NULL) {
        printf ("(%d) MPI_Intercomm_Create returned MPI_COMM_NULL\n", rank);
        printf ("(%d) Aborting...\n", rank);
@@ -61,17 +61,17 @@ main (int argc, char **argv)
       if (comm != MPI_COMM_NULL) {
        MPI_Comm_size (comm, &dnprocs);
        MPI_Comm_rank (comm, &drank);
-      
+
        if (dnprocs > 1) {
          if (drank == 0) {
-           memset (buf0, 0, buf_size);
-           
+           memset (buf0, 0, buf_size*sizeof(int));
+       
            MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, comm, &status);
        
            MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm);
          }
          else if (drank == 1) {
-           memset (buf1, 1, buf_size);
+           memset (buf1, 1, buf_size*sizeof(int));
 
            MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, comm, &status);