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 c2ce2188e32780d846b8366f372258df3b7025c0 (commit) via 410ba24a9f44175d758a41dbbefb30d009ac0503 (commit) from e37e0ee93ee2398b22a6465c79c924cc7d0b814b (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/c2ce2188e32780d846b8366f372258df3b... commit c2ce2188e32780d846b8366f372258df3b7025c0 Author: Paul Coffman <[email protected]> Date: Sun Oct 19 20:07:18 2014 -0500 fix failure to update status in p2pcontig case ADIOI_GPFS_WriteStridedColl and ADIOI_GPFS_ReadStridedColl need to call MPIR_Status_set_bytes when GPFSMPIO_P2PCONTIG=1. When the GPFSMPIO_P2PCONTIG optimization is set, the code path for ADIOI_GPFS_WriteStridedColl and ADIOI_GPFS_ReadStridedColl returns before MPIR_Status_set_bytes is called. Duplicate the call to MPIR_Status_set_bytes in the GPFSMPIO_P2PCONTIG code path. Signed-off-by: Rob Latham <[email protected]> diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c index 92b6336..c2cad8b 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c @@ -299,8 +299,8 @@ void ADIOI_GPFS_ReadStridedColl(ADIO_File fd, void *buf, int count, ADIOI_Free(end_offsets); ADIOI_Free(fd_start); ADIOI_Free(fd_end); + goto fn_exit; - return; } } @@ -398,6 +398,7 @@ void ADIOI_GPFS_ReadStridedColl(ADIO_File fd, void *buf, int count, ADIOI_Free(fd_start); ADIOI_Free(fd_end); +fn_exit: #ifdef HAVE_STATUS_SET_BYTES MPI_Type_size_x(datatype, &size); bufsize = size * count; diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c index 0e2a1d2..968e6e6 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c @@ -288,7 +288,7 @@ void ADIOI_GPFS_WriteStridedColl(ADIO_File fd, const void *buf, int count, ADIOI_Free(fd_start); ADIOI_Free(fd_end); - return; + goto fn_exit; } } @@ -370,6 +370,7 @@ void ADIOI_GPFS_WriteStridedColl(ADIO_File fd, const void *buf, int count, ADIOI_Free(fd_start); ADIOI_Free(fd_end); +fn_exit: #ifdef HAVE_STATUS_SET_BYTES if (status) { MPI_Count bufsize, size; http://git.mpich.org/mpich.git/commitdiff/410ba24a9f44175d758a41dbbefb30d009... commit 410ba24a9f44175d758a41dbbefb30d009ac0503 Author: Rob Latham <[email protected]> Date: Thu Aug 21 15:38:03 2014 +0000 romio: small formatting fix for compiler warnings Update a debug-only print string to accomodate recent updates to the type of the length parameter. No reviewer diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c index 517db04..0e67b54 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c @@ -607,7 +607,7 @@ void ADIOI_GPFS_Calc_my_req(ADIO_File fd, ADIO_Offset *offset_list, ADIO_Offset DBG_FPRINTF(stderr, "data needed from %d (count = %d):\n", i, my_req[i].count); for (l=0; l < my_req[i].count; l++) { - DBG_FPRINTF(stderr, " off[%d] = %lld, len[%d] = %d\n", l, + DBG_FPRINTF(stderr, " off[%d] = %lld, len[%d] = %lld\n", l, my_req[i].offsets[l], l, my_req[i].lens[l]); } } ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_gpfs/ad_gpfs_aggrs.c | 2 +- src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c | 3 ++- src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository