summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2009-08-11 10:35:29 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2009-08-11 10:35:29 (GMT)
commitda73cc2d02248c73cfa545a765d2d017cb0b1bff (patch)
tree82149e88dea81738fb1a1c46a454c98cf52974ec
parent9d27b9765ad7d5ec04762895752bc77b8ac1ec3d (diff)
downloadhdf5-da73cc2d02248c73cfa545a765d2d017cb0b1bff.zip
hdf5-da73cc2d02248c73cfa545a765d2d017cb0b1bff.tar.gz
hdf5-da73cc2d02248c73cfa545a765d2d017cb0b1bff.tar.bz2
[svn-r17318] Did some code cleanup.
t_file.c: replace the old variable, color, with a more meaningfule name of is_old. t_mpi.c: use the official mpi_file_delete, instead of remove, to delete a file in MPI environment. Tested: Only jam in parallel as changes are trivial.
-rw-r--r--testpar/t_file.c8
-rw-r--r--testpar/t_mpi.c6
2 files changed, 8 insertions, 6 deletions
diff --git a/testpar/t_file.c b/testpar/t_file.c
index 9de4e0e..ff983a9 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -36,7 +36,7 @@ test_split_comm_access(void)
int mpi_size, mpi_rank;
MPI_Comm comm;
MPI_Info info = MPI_INFO_NULL;
- int color, mrc;
+ int is_old, mrc;
int newrank, newprocs;
hid_t fid; /* file IDs */
hid_t acc_tpl; /* File access properties */
@@ -52,13 +52,13 @@ test_split_comm_access(void)
/* set up MPI parameters */
MPI_Comm_size(MPI_COMM_WORLD,&mpi_size);
MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
- color = mpi_rank%2;
- mrc = MPI_Comm_split (MPI_COMM_WORLD, color, mpi_rank, &comm);
+ is_old = mpi_rank%2;
+ mrc = MPI_Comm_split (MPI_COMM_WORLD, is_old, mpi_rank, &comm);
VRFY((mrc==MPI_SUCCESS), "");
MPI_Comm_size(comm,&newprocs);
MPI_Comm_rank(comm,&newrank);
- if (color){
+ if (is_old){
/* odd-rank processes */
mrc = MPI_Barrier(comm);
VRFY((mrc==MPI_SUCCESS), "");
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 2195c32..09283e6 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -286,8 +286,9 @@ test_mpio_gb_file(char *filename)
VRFY((buf!=NULL), "malloc succeed");
/* open a new file. Remove it first in case it exists. */
- if (MAINPROCESS)
- remove(filename);
+ /* Must delete because MPI_File_open does not have a Truncate mode. */
+ /* Don't care if it has error. */
+ MPI_File_delete(filename, MPI_INFO_NULL);
MPI_Barrier(MPI_COMM_WORLD); /* prevent racing condition */
mrc = MPI_File_open(MPI_COMM_WORLD, filename, MPI_MODE_CREATE|MPI_MODE_RDWR,
@@ -490,6 +491,7 @@ test_mpio_1wMr(char *filename, int special_request)
/* Must delete because MPI_File_open does not have a Truncate mode. */
/* Don't care if it has error. */
MPI_File_delete(filename, MPI_INFO_NULL);
+ MPI_Barrier(MPI_COMM_WORLD); /* prevent racing condition */
if ((mpi_err = MPI_File_open(MPI_COMM_WORLD, filename,
MPI_MODE_RDWR | MPI_MODE_CREATE ,