[mpich2-commits] r8051 - in mpich2/trunk/src/mpi/romio/adio: ad_nfs common

[robl at mcs.anl.gov]

Author: robl
Date: 2011-02-25 11:17:29 -0600 (Fri, 25 Feb 2011)
New Revision: 8051

Modified:
   mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_getsh.c
   mpich2/trunk/src/mpi/romio/adio/common/ad_get_sh_fp.c
Log:
from Michael Raymond <mraymond at sgi.com>: he found a spot where we can optimize
the no-work case.


Modified: mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_getsh.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_getsh.c	2011-02-25 17:06:22 UTC (rev 8050)
+++ mpich2/trunk/src/mpi/romio/adio/ad_nfs/ad_nfs_getsh.c	2011-02-25 17:17:29 UTC (rev 8051)
@@ -73,6 +73,8 @@
 	}
     }
 
+    if (incr == 0) {goto done;}
+
     new_fp = *shared_fp + incr;
 
 #ifdef ADIOI_MPE_LOGGING
@@ -91,6 +93,7 @@
         MPE_Log_event( ADIOI_MPE_write_b, 0, NULL );
 #endif
     }
+done:
     ADIOI_UNLOCK(fd->shared_fp_fd, 0, SEEK_SET, sizeof(ADIO_Offset));
     if (err == -1) {
 	*error_code = MPIO_Err_create_code(MPI_SUCCESS, MPIR_ERR_RECOVERABLE,

Modified: mpich2/trunk/src/mpi/romio/adio/common/ad_get_sh_fp.c
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/ad_get_sh_fp.c	2011-02-25 17:06:22 UTC (rev 8050)
+++ mpich2/trunk/src/mpi/romio/adio/common/ad_get_sh_fp.c	2011-02-25 17:17:29 UTC (rev 8051)
@@ -65,9 +65,12 @@
 	}
     }
 
+    if (incr == 0) {goto done;}
+
     new_fp = *shared_fp + incr;
 
     ADIO_WriteContig(fd->shared_fp_fd, &new_fp, sizeof(ADIO_Offset), 
 		    MPI_BYTE, ADIO_EXPLICIT_OFFSET, 0, &status, error_code);
+done:
     ADIOI_UNLOCK(fd->shared_fp_fd, 0, SEEK_SET, sizeof(ADIO_Offset));
 }