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 185b0c528ca8a8db48b2b5d703ab84774a2badc5 (commit) from 3a0c834a27913fe32bf0f78a813be1e1797e5967 (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/185b0c528ca8a8db48b2b5d703ab84774a... commit 185b0c528ca8a8db48b2b5d703ab84774a2badc5 Author: Rob Latham <[email protected]> Date: Sun Feb 9 18:28:45 2014 -0600 Clean up resources in error cases if aio not supported or doesn't work or is temporarily unavailable we fall back to blocking versions, but forgot to clean up allocated memory. Closes #2018 Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/mpi/romio/adio/common/ad_iwrite.c b/src/mpi/romio/adio/common/ad_iwrite.c index 35eb482..8177718 100644 --- a/src/mpi/romio/adio/common/ad_iwrite.c +++ b/src/mpi/romio/adio/common/ad_iwrite.c @@ -86,8 +86,8 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset, int err=-1, fd_sys; int error_code; - struct aiocb *aiocbp; - ADIOI_AIO_Request *aio_req; + struct aiocb *aiocbp=NULL; + ADIOI_AIO_Request *aio_req=NULL; MPI_Status status; #if defined(ROMIO_XFS) unsigned maxiosz = wr ? fd->hints->fs_hints.xfs.write_chunk_sz : @@ -158,6 +158,8 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset, ADIO_EXPLICIT_OFFSET, offset, &status, &error_code); MPIO_Completed_request_create(&fd, len, &error_code, request); + if (aiocbp != NULL) ADIOI_Free(aiocbp); + if (aio_req != NULL) ADIOI_Free(aio_req); return 0; } else { return errno; ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/common/ad_iwrite.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository