[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1b1-11-gb111dc3

[mysql vizuser]

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  b111dc3c5739b94505694c0b5d5b7cca364673bb (commit)
      from  c4f38ea6d2575cf53c1e6ce9f01e87dda006e495 (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/b111dc3c5739b94505694c0b5d5b7cca364673bb

commit b111dc3c5739b94505694c0b5d5b7cca364673bb
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Tue Aug 13 13:23:28 2013 -0500

    fall back to blocking version if aio not implemented
    
    FreeBSD 9.1-RELEASE has aio routines that appear to work but
    when called return ENOSYS.  We can handle that, though, if we
    check for that condition.

diff --git a/src/mpi/romio/adio/common/ad_iwrite.c b/src/mpi/romio/adio/common/ad_iwrite.c
index d95f8fc..8848dfd 100644
--- a/src/mpi/romio/adio/common/ad_iwrite.c
+++ b/src/mpi/romio/adio/common/ad_iwrite.c
@@ -146,8 +146,9 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset,
 #endif
 
     if (err == -1) {
-	if (errno == EAGAIN) {
+	if (errno == EAGAIN || errno == ENOSYS) { 
 	    /* exceeded the max. no. of outstanding requests.
+               or, aio routines are not actually implemented 
 	    treat this as a blocking request and return.  */
 	    if (wr) 
 		ADIO_WriteContig(fd, buf, len, MPI_BYTE, 
@@ -159,7 +160,7 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset,
 	    MPIO_Completed_request_create(&fd, len, &error_code, request);
 	    return 0;
 	} else {
-	    return -errno;
+	    return errno;
 	}
     }
     aio_req->aiocbp = aiocbp;

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/adio/common/ad_iwrite.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository