[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-283-g4058ce4

[Service Account]

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  4058ce40d15ef5ce8ba2ce3b90ec0ae3e0568af9 (commit)
      from  33aacdb8fe417c3279b3ee5508e5ed93bdd93f22 (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/4058ce40d15ef5ce8ba2ce3b90ec0ae3e0568af9

commit 4058ce40d15ef5ce8ba2ce3b90ec0ae3e0568af9
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Wed May 28 13:06:36 2014 -0500

    Don't build GPFS hints if headers not found
    
    User is responsible for setting CPPFLAGS and LDFLAGS to find
    headers/libraries needed for gpfs_fcntl() routines.  If not found or not
    available, don't compile that bit of code.
    
    Signed-off-by: Paul Coffman <pkcoff at us.ibm.com>

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 2d890e5..eef476d 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c
@@ -380,7 +380,8 @@ void ADIOI_GPFS_WriteStridedColl(ADIO_File fd, const void *buf, int count,
 
 void gpfs_wr_access_start(int fd, ADIO_Offset offset, ADIO_Offset length)
 {
-        int rc;
+        int rc=0;
+#ifdef HAVE_GPFS_FCNTL_H
         struct {
                 gpfsFcntlHeader_t header;
                 gpfsAccessRange_t access;
@@ -397,12 +398,14 @@ void gpfs_wr_access_start(int fd, ADIO_Offset offset, ADIO_Offset length)
         take_locks.access.isWrite = 1;
 
         rc = gpfs_fcntl(fd, &take_locks);
+#endif
         ADIOI_Assert(rc == 0);
 }
 
 void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
 {
-        int rc;
+        int rc=0;
+#ifdef HAVE_GPFS_FCNTL_H
         struct {
                 gpfsFcntlHeader_t header;
                 gpfsFreeRange_t free;
@@ -419,6 +422,7 @@ void gpfs_wr_access_end(int fd, ADIO_Offset offset, ADIO_Offset length)
         free_locks.free.length = length;
 
         rc = gpfs_fcntl(fd, &free_locks);
+#endif
         ADIOI_Assert(rc == 0);
 }
 

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

Summary of changes:
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_wrcoll.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository