A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kill all trailling whitespaces
[simgrid.git]
/
teshsuite
/
smpi
/
isp
/
umpire
/
intercomm_merge-deadlock.c
diff --git
a/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c
b/teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c
index
6d35a0a
..
f6dfc56
100644
(file)
--- a/
teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c
+++ b/
teshsuite/smpi/isp/umpire/intercomm_merge-deadlock.c
@@
-46,10
+46,10
@@
main (int argc, char **argv)
MPI_Intercomm_create (temp, 0, MPI_COMM_WORLD, rleader,
INTERCOMM_CREATE_TAG, &intercomm);
MPI_Comm_free (&temp);
MPI_Intercomm_create (temp, 0, MPI_COMM_WORLD, rleader,
INTERCOMM_CREATE_TAG, &intercomm);
MPI_Comm_free (&temp);
-
+
if (intercomm != MPI_COMM_NULL) {
/* need to make a different split communicator temporarily... */
if (intercomm != MPI_COMM_NULL) {
/* need to make a different split communicator temporarily... */
- MPI_Comm_split (MPI_COMM_WORLD,
+ MPI_Comm_split (MPI_COMM_WORLD,
rank < nprocs/2, nprocs - rank, &temp);
if (temp != MPI_COMM_NULL) {
rank < nprocs/2, nprocs - rank, &temp);
if (temp != MPI_COMM_NULL) {
@@
-58,7
+58,7
@@
main (int argc, char **argv)
MPI_Intercomm_create (temp, 0, MPI_COMM_WORLD, rleader,
INTERCOMM_CREATE_TAG, &intercomm2);
MPI_Comm_free (&temp);
MPI_Intercomm_create (temp, 0, MPI_COMM_WORLD, rleader,
INTERCOMM_CREATE_TAG, &intercomm2);
MPI_Comm_free (&temp);
-
+
if (intercomm2 != MPI_COMM_NULL) {
if (rank < nprocs/2) {
MPI_Intercomm_merge (intercomm2, rank < nprocs/2, &comm2);
if (intercomm2 != MPI_COMM_NULL) {
if (rank < nprocs/2) {
MPI_Intercomm_merge (intercomm2, rank < nprocs/2, &comm2);
@@
-89,7
+89,7
@@
main (int argc, char **argv)
memset (buf0, 0, buf_size);
MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm);
memset (buf0, 0, buf_size);
MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm);
-
+
MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, comm, &status);
}
}
MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, comm, &status);
}
}
@@
-112,7
+112,7
@@
main (int argc, char **argv)
memset (buf0, 0, buf_size);
MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm2);
memset (buf0, 0, buf_size);
MPI_Send (buf0, buf_size, MPI_INT, 1, 0, comm2);
-
+
MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, comm2, &status);
}
}
MPI_Recv (buf1, buf_size, MPI_INT, 1, 0, comm2, &status);
}
}