From 6d18783f24e4c8477a9d331336580b8679471660 Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Wed, 29 Aug 2018 14:31:17 +0200 Subject: [PATCH] Multiply memset size by size of element in umpire. --- teshsuite/smpi/isp/umpire/any_src-can-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock10.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock10_mod.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock11.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock2.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock3.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock4.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock4_mod.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock5.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock5_mod.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock6.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock6_mod.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock7.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock8.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-can-deadlock9.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-wait-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-waitall-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.c | 2 +- teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.c | 2 +- teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.c | 2 +- teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.c | 2 +- teshsuite/smpi/isp/umpire/basic-deadlock-cart_create.c | 4 ++-- teshsuite/smpi/isp/umpire/basic-deadlock-cart_sub.c | 4 ++-- teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.c | 4 ++-- teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.c | 4 ++-- teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.c | 4 ++-- .../smpi/isp/umpire/basic-deadlock-graph_create.c | 4 ++-- .../smpi/isp/umpire/basic-deadlock-intercomm_create.c | 4 ++-- .../smpi/isp/umpire/basic-deadlock-intercomm_merge.c | 4 ++-- teshsuite/smpi/isp/umpire/basic-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/bcast-deadlock.c | 4 ++-- .../smpi/isp/umpire/collective-misorder-allreduce.c | 4 ++-- teshsuite/smpi/isp/umpire/collective-misorder.c | 4 ++-- teshsuite/smpi/isp/umpire/collective-misorder2.c | 4 ++-- teshsuite/smpi/isp/umpire/complex-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/finalize-deadlock.c | 2 +- teshsuite/smpi/isp/umpire/intercomm_create-deadlock.c | 6 +++--- teshsuite/smpi/isp/umpire/intercomm_create-deadlock2.c | 6 +++--- teshsuite/smpi/isp/umpire/intercomm_create-deadlock3.c | 6 +++--- teshsuite/smpi/isp/umpire/intercomm_create-deadlock4.c | 8 ++++---- teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c | 8 ++++---- teshsuite/smpi/isp/umpire/irecv-deadlock.c | 2 +- teshsuite/smpi/isp/umpire/irecv-isend-ok.c | 4 ++-- teshsuite/smpi/isp/umpire/irecv-isend-ok2.c | 4 ++-- teshsuite/smpi/isp/umpire/lost-request-waitall.c | 4 ++-- teshsuite/smpi/isp/umpire/lost-request.c | 4 ++-- teshsuite/smpi/isp/umpire/lost-request3.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-any_src.c | 2 +- teshsuite/smpi/isp/umpire/no-error-derived-comms.c | 8 ++++---- teshsuite/smpi/isp/umpire/no-error-test.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-testall.c | 2 +- teshsuite/smpi/isp/umpire/no-error-testany.c | 2 +- teshsuite/smpi/isp/umpire/no-error-wait-any_src.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-wait-any_src2.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-wait-any_src3.c | 2 +- teshsuite/smpi/isp/umpire/no-error-wait-any_src4.c | 2 +- teshsuite/smpi/isp/umpire/no-error-wait.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-wait2.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-waitall-any_src.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-waitall-any_src2.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitall-any_src3.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitall.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitany-any_src.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitany-any_src2.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error-waitany-any_src3.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitany.c | 2 +- teshsuite/smpi/isp/umpire/no-error-waitany2.c | 2 +- teshsuite/smpi/isp/umpire/no-error.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error2.c | 6 +++--- teshsuite/smpi/isp/umpire/no-error3-any_src.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error3.c | 4 ++-- teshsuite/smpi/isp/umpire/no-error4-any_src.c | 8 ++++---- teshsuite/smpi/isp/umpire/no-error4.c | 8 ++++---- teshsuite/smpi/isp/umpire/persistent.c | 8 ++++---- teshsuite/smpi/isp/umpire/persistent2.c | 10 +++++----- teshsuite/smpi/isp/umpire/persistent3.c | 8 ++++---- teshsuite/smpi/isp/umpire/persistent4.c | 8 ++++---- teshsuite/smpi/isp/umpire/send-recv-ok.c | 4 ++-- teshsuite/smpi/isp/umpire/sendrecv-deadlock.c | 6 +++--- teshsuite/smpi/isp/umpire/wait-deadlock.c | 4 ++-- teshsuite/smpi/isp/umpire/waitall-deadlock.c | 2 +- teshsuite/smpi/isp/umpire/waitany-deadlock.c | 2 +- 84 files changed, 172 insertions(+), 172 deletions(-) diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock.c index 8f14987a63..d21fe8b0ab 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock.c @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.c index 1d0905954f..f2cf3aa91e 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10.c @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (30); @@ -66,7 +66,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); // sleep (60); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10_mod.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10_mod.c index 67cef7dc5b..b80362f6d0 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock10_mod.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock10_mod.c @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (30); @@ -66,7 +66,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); // sleep (60); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock11.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock11.c index 63058b185f..a81e4d6238 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock11.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock11.c @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); //sleep (30); @@ -66,7 +66,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); //sleep (60); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock2.c index 562af09d34..d73cdb1742 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock2.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock2.c @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (60); @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock3.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock3.c index 889cf38c5a..248d208dc2 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock3.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock3.c @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); //sleep (60); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.c index a68a1589fe..1f9e86da1c 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4.c @@ -51,7 +51,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -61,7 +61,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4_mod.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4_mod.c index 0d3adfc8fb..0ba01eab5a 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock4_mod.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock4_mod.c @@ -51,7 +51,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -61,7 +61,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.c index 1f4c0cd7e6..95390f7916 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5.c @@ -55,7 +55,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -65,7 +65,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); // sleep (30); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5_mod.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5_mod.c index b43b516e64..fe8be2207f 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock5_mod.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock5_mod.c @@ -55,7 +55,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -65,7 +65,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); // sleep (30); diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.c index bc9bef9fb4..67f15aa231 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6.c @@ -55,7 +55,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (30); @@ -67,7 +67,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6_mod.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6_mod.c index 3dc1c190e3..6c6965f714 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock6_mod.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock6_mod.c @@ -55,7 +55,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (30); @@ -67,7 +67,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock7.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock7.c index 2cf5d54a9b..3d3364c73c 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock7.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock7.c @@ -53,7 +53,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -63,7 +63,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock8.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock8.c index 0d2280845d..14c48311cb 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock8.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock8.c @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); // sleep (30); @@ -68,7 +68,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-can-deadlock9.c b/teshsuite/smpi/isp/umpire/any_src-can-deadlock9.c index b4849392b4..3e08adf352 100644 --- a/teshsuite/smpi/isp/umpire/any_src-can-deadlock9.c +++ b/teshsuite/smpi/isp/umpire/any_src-can-deadlock9.c @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -66,7 +66,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); // sleep (30); diff --git a/teshsuite/smpi/isp/umpire/any_src-deadlock.c b/teshsuite/smpi/isp/umpire/any_src-deadlock.c index e6b990ff2b..8841969557 100644 --- a/teshsuite/smpi/isp/umpire/any_src-deadlock.c +++ b/teshsuite/smpi/isp/umpire/any_src-deadlock.c @@ -41,8 +41,8 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); - memset (buf1, 1, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.c b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.c index 1b91f58abb..c3f864c1df 100644 --- a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.c +++ b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock.c @@ -35,7 +35,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c index bb3eda69c9..1ab9cf97e3 100644 --- a/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c +++ b/teshsuite/smpi/isp/umpire/any_src-wait-deadlock2.c @@ -35,7 +35,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); @@ -52,7 +52,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock.c b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock.c index 5e2dc2981d..e267da2310 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock.c +++ b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock.c @@ -51,7 +51,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -61,7 +61,7 @@ main (int argc, char **argv) { MPI_Recv (buf0, buf_size, MPI_INT, 0, 2, MPI_COMM_WORLD, statuses); - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.c index 461953212b..7fd911327a 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.c +++ b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock2.c @@ -49,7 +49,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.c b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.c index 7fcd71dc0f..e0bb1267d2 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.c +++ b/teshsuite/smpi/isp/umpire/any_src-waitall-deadlock3.c @@ -49,7 +49,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.c b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.c index 008c7400ed..50509a612c 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.c +++ b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock.c @@ -50,7 +50,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Recv (buf1, buf_size, MPI_INT, 0, 1, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.c b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.c index 8b345592ac..c6b2e6025a 100644 --- a/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.c +++ b/teshsuite/smpi/isp/umpire/any_src-waitany-deadlock2.c @@ -50,7 +50,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-cart_create.c b/teshsuite/smpi/isp/umpire/basic-deadlock-cart_create.c index 145f900cdb..61a7d12e45 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-cart_create.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-cart_create.c @@ -51,14 +51,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-cart_sub.c b/teshsuite/smpi/isp/umpire/basic-deadlock-cart_sub.c index 0e15d1f036..902fad2449 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-cart_sub.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-cart_sub.c @@ -64,14 +64,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.c b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.c index 0c75f1fad6..0bcb22d570 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_create.c @@ -56,14 +56,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.c b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.c index c115c5aa27..a4a8b7c5b1 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_dup.c @@ -36,14 +36,14 @@ main (int argc, char **argv) MPI_Comm_dup (MPI_COMM_WORLD, &comm); if (rank == 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 (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, comm, &status); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.c b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.c index 17ce7e5c1c..e6551cbe8c 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-comm_split.c @@ -42,14 +42,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-graph_create.c b/teshsuite/smpi/isp/umpire/basic-deadlock-graph_create.c index c800ba65db..fe3df2b772 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-graph_create.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-graph_create.c @@ -48,14 +48,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_create.c b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_create.c index f3a345e2f2..c04617d2b0 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_create.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_create.c @@ -54,14 +54,14 @@ main (int argc, char **argv) if (rnprocs > drank) { if (rank % 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, drank, 0, intercomm, &status); MPI_Send (buf1, buf_size, MPI_INT, drank, 0, intercomm); } else { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Recv (buf1, buf_size, MPI_INT, drank, 0, intercomm, &status); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c index 587569c5ce..6054a7d1b4 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock-intercomm_merge.c @@ -64,14 +64,14 @@ main (int argc, char **argv) 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); diff --git a/teshsuite/smpi/isp/umpire/basic-deadlock.c b/teshsuite/smpi/isp/umpire/basic-deadlock.c index 60a3f6b905..b9a5840965 100644 --- a/teshsuite/smpi/isp/umpire/basic-deadlock.c +++ b/teshsuite/smpi/isp/umpire/basic-deadlock.c @@ -34,7 +34,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &status); @@ -42,7 +42,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/bcast-deadlock.c b/teshsuite/smpi/isp/umpire/bcast-deadlock.c index 6798490fb9..6b90e8675c 100644 --- a/teshsuite/smpi/isp/umpire/bcast-deadlock.c +++ b/teshsuite/smpi/isp/umpire/bcast-deadlock.c @@ -24,13 +24,13 @@ main (int argc, char **argv) fflush (stdout); if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Bcast (buf0, buf_size, MPI_INT, 1, MPI_COMM_WORLD); MPI_Bcast (buf0, buf_size, MPI_INT, 0, MPI_COMM_WORLD); } else { if (rank == 1) - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Bcast (buf0, buf_size, MPI_INT, 0, MPI_COMM_WORLD); MPI_Bcast (buf0, buf_size, MPI_INT, 1, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c index 66d774bf75..67fc3790c3 100644 --- a/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c +++ b/teshsuite/smpi/isp/umpire/collective-misorder-allreduce.c @@ -32,8 +32,8 @@ main (int argc, char **argv) printf ("(%d) is alive on %s\n", rank, processor_name); fflush (stdout); - memset (sbuf, 0, buf_size); - memset (rbuf, 1, buf_size); + memset (sbuf, 0, buf_size*sizeof(int)); + memset (rbuf, 1, buf_size*sizeof(int)); MPI_Barrier (comm); diff --git a/teshsuite/smpi/isp/umpire/collective-misorder.c b/teshsuite/smpi/isp/umpire/collective-misorder.c index 4cade731a7..ab6f32c407 100644 --- a/teshsuite/smpi/isp/umpire/collective-misorder.c +++ b/teshsuite/smpi/isp/umpire/collective-misorder.c @@ -32,8 +32,8 @@ main (int argc, char **argv) printf ("(%d) is alive on %s\n", rank, processor_name); fflush (stdout); - memset (buf0, 0, buf_size); - memset (buf1, 1, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Barrier (comm); MPI_Barrier (comm); diff --git a/teshsuite/smpi/isp/umpire/collective-misorder2.c b/teshsuite/smpi/isp/umpire/collective-misorder2.c index a6da78d7a9..69e7790c0f 100644 --- a/teshsuite/smpi/isp/umpire/collective-misorder2.c +++ b/teshsuite/smpi/isp/umpire/collective-misorder2.c @@ -32,8 +32,8 @@ main (int argc, char **argv) printf ("(%d) is alive on %s\n", rank, processor_name); fflush (stdout); - memset (buf0, 0, buf_size); - memset (buf1, 1, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Barrier (comm); MPI_Barrier (comm); diff --git a/teshsuite/smpi/isp/umpire/complex-deadlock.c b/teshsuite/smpi/isp/umpire/complex-deadlock.c index 6981e60bdd..47c383a435 100644 --- a/teshsuite/smpi/isp/umpire/complex-deadlock.c +++ b/teshsuite/smpi/isp/umpire/complex-deadlock.c @@ -35,7 +35,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); zero_to_two = 1; @@ -47,7 +47,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/finalize-deadlock.c b/teshsuite/smpi/isp/umpire/finalize-deadlock.c index 80bc5b3b2f..2e3278ea6a 100644 --- a/teshsuite/smpi/isp/umpire/finalize-deadlock.c +++ b/teshsuite/smpi/isp/umpire/finalize-deadlock.c @@ -39,7 +39,7 @@ main (int argc, char **argv) else if ((rank == 1) && (its_raining)) { /* This code is never executed... */ - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock.c b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock.c index 5f05b58005..9165e0d06d 100644 --- a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock.c +++ b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock.c @@ -56,7 +56,7 @@ main (int argc, char **argv) if (tnprocs > 1) { if (trank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, temp); } @@ -74,14 +74,14 @@ main (int argc, char **argv) if (rnprocs > drank) { if (rank % 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, drank, 0, intercomm, &status); MPI_Send (buf1, buf_size, MPI_INT, drank, 0, intercomm); } else { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, drank, 0, intercomm); diff --git a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock2.c b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock2.c index 3dbfc76be1..fe6411eb27 100644 --- a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock2.c +++ b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock2.c @@ -56,7 +56,7 @@ main (int argc, char **argv) INTERCOMM_CREATE_TAG, &intercomm); if ((trank == 0) && !(rank % 2)) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, temp); } @@ -73,14 +73,14 @@ main (int argc, char **argv) if (rnprocs > drank) { if (rank % 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, drank, 0, intercomm, &status); MPI_Send (buf1, buf_size, MPI_INT, drank, 0, intercomm); } else { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, drank, 0, intercomm); diff --git a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock3.c b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock3.c index 908b8873f4..663ded7e29 100644 --- a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock3.c +++ b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock3.c @@ -55,7 +55,7 @@ main (int argc, char **argv) INTERCOMM_CREATE_TAG, &intercomm); if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD); } @@ -69,14 +69,14 @@ main (int argc, char **argv) if (rnprocs > drank) { if (rank % 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, drank, 0, intercomm, &status); MPI_Send (buf1, buf_size, MPI_INT, drank, 0, intercomm); } else { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, drank, 0, intercomm); diff --git a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock4.c b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock4.c index c84e94fb82..25a53b59d1 100644 --- a/teshsuite/smpi/isp/umpire/intercomm_create-deadlock4.c +++ b/teshsuite/smpi/isp/umpire/intercomm_create-deadlock4.c @@ -58,12 +58,12 @@ main (int argc, char **argv) INTERCOMM_CREATE_TAG, &intercomm); if (rank == 2) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, rleader, 0, MPI_COMM_WORLD); } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } @@ -77,14 +77,14 @@ main (int argc, char **argv) if (rnprocs > drank) { if (rank % 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, drank, 0, intercomm, &status); MPI_Send (buf1, buf_size, MPI_INT, drank, 0, intercomm); } else { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, drank, 0, intercomm); diff --git a/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c b/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c index f6dfc567fb..aeb4993c98 100644 --- a/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c +++ b/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c @@ -79,14 +79,14 @@ main (int argc, char **argv) if (dnprocs > 1) { 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); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, comm); } else if (drank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm); @@ -102,14 +102,14 @@ main (int argc, char **argv) if (dnprocs > 1) { if (drank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, comm2, &status); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, comm2); } else if (drank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm2); diff --git a/teshsuite/smpi/isp/umpire/irecv-deadlock.c b/teshsuite/smpi/isp/umpire/irecv-deadlock.c index a4ab3d0a22..d9a51a1168 100644 --- a/teshsuite/smpi/isp/umpire/irecv-deadlock.c +++ b/teshsuite/smpi/isp/umpire/irecv-deadlock.c @@ -36,7 +36,7 @@ main (int argc, char **argv) { int dest = (rank == nprocs - 1) ? (0) : (rank + 1); int src = (rank == 0) ? (nprocs - 1) : (rank - 1); - memset (buf0, rank, buf_size); + memset (buf0, rank, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, src, 0, MPI_COMM_WORLD, &req); MPI_Wait(&req,&status); MPI_Send (buf0, buf_size, MPI_INT, dest, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/irecv-isend-ok.c b/teshsuite/smpi/isp/umpire/irecv-isend-ok.c index a0a2bd4599..68520868a5 100644 --- a/teshsuite/smpi/isp/umpire/irecv-isend-ok.c +++ b/teshsuite/smpi/isp/umpire/irecv-isend-ok.c @@ -38,8 +38,8 @@ main (int argc, char **argv) { int dest = (rank == nprocs - 1) ? (0) : (rank + 1); int src = (rank == 0) ? (nprocs - 1) : (rank - 1); - memset (buf0, rank, buf_size); - memset (buf1, rank, buf_size); + memset (buf0, rank, buf_size*sizeof(int)); + memset (buf1, rank, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, src, 0, MPI_COMM_WORLD, &req1); MPI_Isend (buf1, buf_size, MPI_INT, dest, 0, MPI_COMM_WORLD, &req2); MPI_Wait(&req2,&status); diff --git a/teshsuite/smpi/isp/umpire/irecv-isend-ok2.c b/teshsuite/smpi/isp/umpire/irecv-isend-ok2.c index b5f60b2c6e..1b8d51186d 100644 --- a/teshsuite/smpi/isp/umpire/irecv-isend-ok2.c +++ b/teshsuite/smpi/isp/umpire/irecv-isend-ok2.c @@ -40,8 +40,8 @@ main (int argc, char **argv) { int dest = (rank == nprocs - 1) ? (0) : (rank + 1); int src = (rank == 0) ? (nprocs - 1) : (rank - 1); - memset (buf0, rank, buf_size); - memset (buf1, rank, buf_size); + memset (buf0, rank, buf_size*sizeof(int)); + memset (buf1, rank, buf_size*sizeof(int)); for (i = 0; i < req_count; i++) { MPI_Irecv (buf0, buf_size, MPI_INT, src, 0, MPI_COMM_WORLD, &req1); diff --git a/teshsuite/smpi/isp/umpire/lost-request-waitall.c b/teshsuite/smpi/isp/umpire/lost-request-waitall.c index 9eee182988..58976d3a15 100644 --- a/teshsuite/smpi/isp/umpire/lost-request-waitall.c +++ b/teshsuite/smpi/isp/umpire/lost-request-waitall.c @@ -50,8 +50,8 @@ main (int argc, char **argv) printf ("(%d) is alive on %s\n", rank, processor_name); fflush (stdout); - memset (buf0, 0, buf_size); - memset (buf1, 1, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); + memset (buf1, 1, buf_size*sizeof(int)); /* 0 sends 1 two messages, but the request gets overwritten */ switch (rank) diff --git a/teshsuite/smpi/isp/umpire/lost-request.c b/teshsuite/smpi/isp/umpire/lost-request.c index 8baabb5a55..840c5db6a5 100644 --- a/teshsuite/smpi/isp/umpire/lost-request.c +++ b/teshsuite/smpi/isp/umpire/lost-request.c @@ -47,8 +47,8 @@ main (int argc, char **argv) printf ("(%d) is alive on %s\n", rank, processor_name); fflush (stdout); - memset (buf0, 1, buf_size); - memset (buf1, 2, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); + memset (buf1, 2, buf_size*sizeof(int)); MPI_Barrier(MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/lost-request3.c b/teshsuite/smpi/isp/umpire/lost-request3.c index 3be717c059..ef8b4dda47 100644 --- a/teshsuite/smpi/isp/umpire/lost-request3.c +++ b/teshsuite/smpi/isp/umpire/lost-request3.c @@ -51,7 +51,7 @@ main (int argc, char **argv) { case 0: for (i = 0; i < ITERATIONS; i++) { - memset (buf, 1, buf_size * REQS_PER_ITERATION); + memset (buf, 1, buf_size*sizeof(int) * REQS_PER_ITERATION); for (j = 0; j < REQS_PER_ITERATION; j++) { MPI_Isend (&buf[j*buf_size], buf_size, MPI_INT, @@ -65,7 +65,7 @@ main (int argc, char **argv) case 1: for (i = 0; i < ITERATIONS; i++) { - memset (buf, 2, buf_size * REQS_PER_ITERATION); + memset (buf, 2, buf_size*sizeof(int) * REQS_PER_ITERATION); for (j = 0; j < REQS_PER_ITERATION; j++) { MPI_Irecv (&buf[j*buf_size], buf_size, MPI_INT, diff --git a/teshsuite/smpi/isp/umpire/no-error-any_src.c b/teshsuite/smpi/isp/umpire/no-error-any_src.c index 3d408f672e..107b0fca06 100644 --- a/teshsuite/smpi/isp/umpire/no-error-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error-any_src.c @@ -39,7 +39,7 @@ main (int argc, char **argv) } } else { - memset (buf, 1, buf_size); + memset (buf, 1, buf_size*sizeof(int)); MPI_Send (buf, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/no-error-derived-comms.c b/teshsuite/smpi/isp/umpire/no-error-derived-comms.c index 4f64a2776d..daef65fed9 100644 --- a/teshsuite/smpi/isp/umpire/no-error-derived-comms.c +++ b/teshsuite/smpi/isp/umpire/no-error-derived-comms.c @@ -233,7 +233,7 @@ main (int argc, char **argv) } } else { - memset (buf, 1, buf_size); + memset (buf, 1, buf_size*sizeof(int)); MPI_Send (buf, buf_size, MPI_INT, 0, 0, dcomms[i]); } @@ -249,7 +249,7 @@ main (int argc, char **argv) } else if ((rank % 3) == 2) { for (j = 0; j < intersize; j++) { - memset (buf, 1, buf_size); + memset (buf, 1, buf_size*sizeof(int)); MPI_Send (buf, buf_size, MPI_INT, j, 0, intercomm); } @@ -273,7 +273,7 @@ main (int argc, char **argv) } } else { - memset (buf, 1, buf_size); + memset (buf, 1, buf_size*sizeof(int)); MPI_Send (buf, buf_size, MPI_INT, 0, 0, dcomms[i]); } @@ -290,7 +290,7 @@ main (int argc, char **argv) } else if ((rank % 3) == 2) { for (j = 0; j < intersize; j++) { - memset (buf, 1, buf_size); + memset (buf, 1, buf_size*sizeof(int)); MPI_Send (buf, buf_size, MPI_INT, j, 0, intercomm); } diff --git a/teshsuite/smpi/isp/umpire/no-error-test.c b/teshsuite/smpi/isp/umpire/no-error-test.c index 05b03c8280..8622177d7a 100644 --- a/teshsuite/smpi/isp/umpire/no-error-test.c +++ b/teshsuite/smpi/isp/umpire/no-error-test.c @@ -35,7 +35,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &req); @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/no-error-testall.c b/teshsuite/smpi/isp/umpire/no-error-testall.c index 3f497c511b..9d8c31d455 100644 --- a/teshsuite/smpi/isp/umpire/no-error-testall.c +++ b/teshsuite/smpi/isp/umpire/no-error-testall.c @@ -47,7 +47,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/no-error-testany.c b/teshsuite/smpi/isp/umpire/no-error-testany.c index f7924fdc41..01acc8003f 100644 --- a/teshsuite/smpi/isp/umpire/no-error-testany.c +++ b/teshsuite/smpi/isp/umpire/no-error-testany.c @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); for (i = 3; i > 0; i--) { MPI_Recv (&flipbit, 1, MPI_INT, 0, i, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait-any_src.c b/teshsuite/smpi/isp/umpire/no-error-wait-any_src.c index 0ab83aa9ae..ee2e2aea08 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait-any_src.c @@ -34,7 +34,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); @@ -45,7 +45,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait-any_src2.c b/teshsuite/smpi/isp/umpire/no-error-wait-any_src2.c index 59ed5d0036..de167a3fcf 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait-any_src2.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait-any_src2.c @@ -43,8 +43,8 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); - memset (buf1, 1, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait-any_src3.c b/teshsuite/smpi/isp/umpire/no-error-wait-any_src3.c index 7d17a6cc21..eedca26a63 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait-any_src3.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait-any_src3.c @@ -41,7 +41,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait-any_src4.c b/teshsuite/smpi/isp/umpire/no-error-wait-any_src4.c index d76749fe07..52b39a135b 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait-any_src4.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait-any_src4.c @@ -49,7 +49,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait.c b/teshsuite/smpi/isp/umpire/no-error-wait.c index 0f9d331eac..057523cf59 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait.c @@ -34,7 +34,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &req); @@ -44,7 +44,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/no-error-wait2.c b/teshsuite/smpi/isp/umpire/no-error-wait2.c index 2318a95477..1744416b7f 100644 --- a/teshsuite/smpi/isp/umpire/no-error-wait2.c +++ b/teshsuite/smpi/isp/umpire/no-error-wait2.c @@ -36,7 +36,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &req); @@ -48,7 +48,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src.c b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src.c index 2c7f144586..d3125b3988 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src.c @@ -57,7 +57,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -65,7 +65,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src2.c b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src2.c index 56c7e6cfd1..b886746b2a 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src2.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src2.c @@ -47,7 +47,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src3.c b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src3.c index 835d2a560d..53e97855e9 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitall-any_src3.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitall-any_src3.c @@ -49,7 +49,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitall.c b/teshsuite/smpi/isp/umpire/no-error-waitall.c index b1def37a02..d341c7e797 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitall.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitall.c @@ -47,7 +47,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src.c b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src.c index d8a7e89560..dcfc430ba0 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src.c @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); for (i = 3; i > 0; i--) { MPI_Recv (&flipbit, 1, MPI_INT, diff --git a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src2.c b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src2.c index 4a64b34b2c..f4b58f0c5b 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src2.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src2.c @@ -61,7 +61,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); @@ -71,7 +71,7 @@ main (int argc, char **argv) { MPI_Recv (buf0, buf_size, MPI_INT, 0, 2, MPI_COMM_WORLD, &status); - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src3.c b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src3.c index a9e522b0e9..21defbc859 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitany-any_src3.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitany-any_src3.c @@ -50,7 +50,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitany.c b/teshsuite/smpi/isp/umpire/no-error-waitany.c index 20ff43cec6..6f90c53f3c 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitany.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitany.c @@ -53,7 +53,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); for (i = 3; i > 0; i--) { MPI_Recv (&flipbit, 1, MPI_INT, 0, i, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error-waitany2.c b/teshsuite/smpi/isp/umpire/no-error-waitany2.c index 7de46f9303..fad99caf2a 100644 --- a/teshsuite/smpi/isp/umpire/no-error-waitany2.c +++ b/teshsuite/smpi/isp/umpire/no-error-waitany2.c @@ -66,7 +66,7 @@ printf ("Done = %d\n", done); } else if (rank == 1) { - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); for (i = 3; i >= 0; i--) { MPI_Recv (&flipbit, 1, MPI_INT, 0, i, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error.c b/teshsuite/smpi/isp/umpire/no-error.c index a78e7fe25e..0891d5298d 100644 --- a/teshsuite/smpi/isp/umpire/no-error.c +++ b/teshsuite/smpi/isp/umpire/no-error.c @@ -34,7 +34,7 @@ main (int argc, char **argv) { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, 1, 0, buf1, buf_size, MPI_INT, 1, 0, @@ -52,7 +52,7 @@ main (int argc, char **argv) { if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Sendrecv (buf1, buf_size, MPI_INT, 0, 0, buf0, buf_size, MPI_INT, 0, 0, diff --git a/teshsuite/smpi/isp/umpire/no-error2.c b/teshsuite/smpi/isp/umpire/no-error2.c index 659c1c2ef8..a323019f04 100644 --- a/teshsuite/smpi/isp/umpire/no-error2.c +++ b/teshsuite/smpi/isp/umpire/no-error2.c @@ -31,17 +31,17 @@ main (int argc, char **argv) src = (rank + 1) % nprocs; dest = (rank - 1 + nprocs) % nprocs; - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, dest, 0, buf1, buf_size, MPI_INT, src, 0, MPI_COMM_WORLD, &status); - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Sendrecv (buf1, buf_size, MPI_INT, src, 0, buf0, buf_size, MPI_INT, dest, 0, MPI_COMM_WORLD, &status); - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, dest, 0, buf1, buf_size, MPI_INT, src, 0, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error3-any_src.c b/teshsuite/smpi/isp/umpire/no-error3-any_src.c index c3ba9bb7e4..3562abd0ce 100644 --- a/teshsuite/smpi/isp/umpire/no-error3-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error3-any_src.c @@ -33,14 +33,14 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, 1, 0, buf1, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &status); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error3.c b/teshsuite/smpi/isp/umpire/no-error3.c index 30e6e115dd..2ed4e13e0a 100644 --- a/teshsuite/smpi/isp/umpire/no-error3.c +++ b/teshsuite/smpi/isp/umpire/no-error3.c @@ -33,14 +33,14 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, 1, 0, buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &status); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); diff --git a/teshsuite/smpi/isp/umpire/no-error4-any_src.c b/teshsuite/smpi/isp/umpire/no-error4-any_src.c index ecadd932a9..c0ab9fcdef 100644 --- a/teshsuite/smpi/isp/umpire/no-error4-any_src.c +++ b/teshsuite/smpi/isp/umpire/no-error4-any_src.c @@ -36,7 +36,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, @@ -47,13 +47,13 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, MPI_ANY_SOURCE, 0, MPI_COMM_WORLD, &aReq[0]); @@ -64,7 +64,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); MPI_Waitall (2, aReq, aStatus); diff --git a/teshsuite/smpi/isp/umpire/no-error4.c b/teshsuite/smpi/isp/umpire/no-error4.c index c962ccacd8..a1a2593ea8 100644 --- a/teshsuite/smpi/isp/umpire/no-error4.c +++ b/teshsuite/smpi/isp/umpire/no-error4.c @@ -36,7 +36,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[1]); @@ -46,14 +46,14 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Send_init (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[1]); @@ -63,7 +63,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); diff --git a/teshsuite/smpi/isp/umpire/persistent.c b/teshsuite/smpi/isp/umpire/persistent.c index ea4c12b180..49c279519b 100644 --- a/teshsuite/smpi/isp/umpire/persistent.c +++ b/teshsuite/smpi/isp/umpire/persistent.c @@ -38,7 +38,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[1]); @@ -48,7 +48,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); @@ -59,7 +59,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Send_init (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[1]); @@ -69,7 +69,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); diff --git a/teshsuite/smpi/isp/umpire/persistent2.c b/teshsuite/smpi/isp/umpire/persistent2.c index 6b34a5831c..9dd14e7593 100644 --- a/teshsuite/smpi/isp/umpire/persistent2.c +++ b/teshsuite/smpi/isp/umpire/persistent2.c @@ -37,7 +37,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[1]); @@ -47,11 +47,11 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); /* activate a request twice */ MPI_Start (&aReq[0]); @@ -59,7 +59,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Send_init (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[1]); @@ -69,7 +69,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); diff --git a/teshsuite/smpi/isp/umpire/persistent3.c b/teshsuite/smpi/isp/umpire/persistent3.c index 100d58a3c9..569f274ebe 100644 --- a/teshsuite/smpi/isp/umpire/persistent3.c +++ b/teshsuite/smpi/isp/umpire/persistent3.c @@ -39,7 +39,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[1]); @@ -49,7 +49,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); @@ -60,7 +60,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Send_init (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[1]); @@ -70,7 +70,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); diff --git a/teshsuite/smpi/isp/umpire/persistent4.c b/teshsuite/smpi/isp/umpire/persistent4.c index 131a823cc3..c3f82aaad5 100644 --- a/teshsuite/smpi/isp/umpire/persistent4.c +++ b/teshsuite/smpi/isp/umpire/persistent4.c @@ -40,7 +40,7 @@ main (int argc, char **argv) } else { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send_init (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Recv_init (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &aReq[1]); @@ -50,14 +50,14 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); MPI_Startall (2, aReq); MPI_Waitall (2, aReq, aStatus); } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv_init (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[0]); MPI_Send_init (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &aReq[1]); @@ -67,7 +67,7 @@ main (int argc, char **argv) MPI_Waitall (2, aReq, aStatus); - memset (buf1, 0, buf_size); + memset (buf1, 0, buf_size*sizeof(int)); MPI_Startall (2, aReq); diff --git a/teshsuite/smpi/isp/umpire/send-recv-ok.c b/teshsuite/smpi/isp/umpire/send-recv-ok.c index c85f143cfb..e4325fb667 100644 --- a/teshsuite/smpi/isp/umpire/send-recv-ok.c +++ b/teshsuite/smpi/isp/umpire/send-recv-ok.c @@ -32,14 +32,14 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Send (buf0, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD); MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &status); } else if (rank == 1) { MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); } diff --git a/teshsuite/smpi/isp/umpire/sendrecv-deadlock.c b/teshsuite/smpi/isp/umpire/sendrecv-deadlock.c index 1f8f98f8c1..8c91f275c7 100644 --- a/teshsuite/smpi/isp/umpire/sendrecv-deadlock.c +++ b/teshsuite/smpi/isp/umpire/sendrecv-deadlock.c @@ -36,7 +36,7 @@ main (int argc, char **argv) { if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Sendrecv (buf0, buf_size, MPI_INT, 1, 0, buf1, buf_size, MPI_INT, 1, 0, @@ -46,7 +46,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Recv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &status); @@ -56,7 +56,7 @@ main (int argc, char **argv) } else if (rank == 2) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Send (buf1, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD); diff --git a/teshsuite/smpi/isp/umpire/wait-deadlock.c b/teshsuite/smpi/isp/umpire/wait-deadlock.c index e528524b18..288be7ca11 100644 --- a/teshsuite/smpi/isp/umpire/wait-deadlock.c +++ b/teshsuite/smpi/isp/umpire/wait-deadlock.c @@ -34,7 +34,7 @@ main (int argc, char **argv) } else if (rank == 0) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Irecv (buf1, buf_size, MPI_INT, 1, 0, MPI_COMM_WORLD, &req); @@ -44,7 +44,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf1, 1, buf_size); + memset (buf1, 1, buf_size*sizeof(int)); MPI_Irecv (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &req); diff --git a/teshsuite/smpi/isp/umpire/waitall-deadlock.c b/teshsuite/smpi/isp/umpire/waitall-deadlock.c index 5cf0a884b8..be2a1e0c48 100644 --- a/teshsuite/smpi/isp/umpire/waitall-deadlock.c +++ b/teshsuite/smpi/isp/umpire/waitall-deadlock.c @@ -47,7 +47,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 0, buf_size); + memset (buf0, 0, buf_size*sizeof(int)); MPI_Isend (buf0, buf_size, MPI_INT, 0, 0, MPI_COMM_WORLD, &reqs[0]); diff --git a/teshsuite/smpi/isp/umpire/waitany-deadlock.c b/teshsuite/smpi/isp/umpire/waitany-deadlock.c index 76dcb1bd21..403ffb1184 100644 --- a/teshsuite/smpi/isp/umpire/waitany-deadlock.c +++ b/teshsuite/smpi/isp/umpire/waitany-deadlock.c @@ -54,7 +54,7 @@ main (int argc, char **argv) } else if (rank == 1) { - memset (buf0, 1, buf_size); + memset (buf0, 1, buf_size*sizeof(int)); for (i = 3; i > 0; i--) { MPI_Recv (&flipbit, 1, MPI_INT, 0, i, MPI_COMM_WORLD, &status); -- 2.20.1