summaryrefslogtreecommitdiffstats
path: root/src/H5FDmpio.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-07-19 13:43:22 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-07-19 13:43:22 (GMT)
commita37131ef04d9b2aab2ee7adeceea43dbd1670ba2 (patch)
tree1417f4a2bea20396809f12d597920d7586bb4eea /src/H5FDmpio.c
parent1ff6aff53dacca3afaa96ad959c857693ea6f6d6 (diff)
downloadhdf5-a37131ef04d9b2aab2ee7adeceea43dbd1670ba2.zip
hdf5-a37131ef04d9b2aab2ee7adeceea43dbd1670ba2.tar.gz
hdf5-a37131ef04d9b2aab2ee7adeceea43dbd1670ba2.tar.bz2
[svn-r19097] Description:
Bring r19096 from trunk to 1.8 branch: Bring "round robin" metadata write strategy code from 'round_robin' branch to the trunk. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode Mac OS X/32 10.6.3 (amazon) in debug mode Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5FDmpio.c')
-rw-r--r--src/H5FDmpio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 117dfc7..b382fb4 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -1771,6 +1771,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
} /* end if */
} /* end if */
else {
+#if 0 /* JRM -- 3/23/10 */ /* this is no longer always the case */
/* Only one process can do the actual metadata write */
if(file->mpi_rank != H5_PAR_META_WRITE)
#ifdef LATER
@@ -1778,6 +1779,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
#else /* LATER */
HGOTO_DONE(SUCCEED) /* skip the actual write */
#endif /* LATER */
+#endif /* JRM */
} /* end if */
/* Write the data. */