This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 6f05c767e32172545cf8a50538762943d7ff5618 (commit) via 8c8820de103189ff40f577fe0dde73ddb1c1e307 (commit) from f8bedf1e74383cf166a278dd93fdad078cefc78e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/6f05c767e32172545cf8a50538762943d7... commit 6f05c767e32172545cf8a50538762943d7ff5618 Author: Rob Latham <[email protected]> Date: Fri Jun 21 16:14:05 2013 -0500 check existance of headers before including diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index ebd7d73..308b946 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -7,8 +7,12 @@ #include "adio.h" +#ifdef HAVE_UNISTD_H #include <unistd.h> +#endif +#ifdef HAVE_SYS_TYPES_H #include <sys/types.h> +#endif /* The following function selects the name of the file to be used to store the shared file pointer. The shared-file-pointer file is a http://git.mpich.org/mpich.git/commitdiff/8c8820de103189ff40f577fe0dde73ddb1... commit 8c8820de103189ff40f577fe0dde73ddb1c1e307 Author: Qi QC Zhang <[email protected]> Date: Mon Dec 17 02:04:48 2012 -0500 MPI_File_close shared file fail occasionally w/ case rw_share4 (ibm) D187762 (ibm) 0404df3637157f9aac3644ca62d9ed7f61e5d73d Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpi/romio/adio/common/shfp_fname.c b/src/mpi/romio/adio/common/shfp_fname.c index 024ced5..ebd7d73 100644 --- a/src/mpi/romio/adio/common/shfp_fname.c +++ b/src/mpi/romio/adio/common/shfp_fname.c @@ -7,6 +7,9 @@ #include "adio.h" +#include <unistd.h> +#include <sys/types.h> + /* The following function selects the name of the file to be used to store the shared file pointer. The shared-file-pointer file is a hidden file in the same directory as the real file being accessed. @@ -21,6 +24,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) double tm; int i, len; char *slash, *ptr, tmp[128]; + int pid = 0; fd->shared_fp_fname = (char *) ADIOI_Malloc(256); @@ -31,6 +35,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) tm = tm - (double) i; tm *= 1000000.0; i = (int) tm; + pid = (int)getpid(); ADIOI_Strncpy(fd->shared_fp_fname, fd->filename, 256); @@ -55,7 +60,7 @@ void ADIOI_Shfp_fname(ADIO_File fd, int rank) ADIOI_Strncpy(slash + 2, ptr + 1, len); } - ADIOI_Snprintf(tmp, 128, ".shfp.%d", i); + ADIOI_Snprintf(tmp, 128, ".shfp.%d.%d", pid, i); ADIOI_Strnapp(fd->shared_fp_fname, tmp, 256); len = (int)strlen(fd->shared_fp_fname); ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/shfp_fname.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository