summaryrefslogtreecommitdiffstats
path: root/src/H5Fcontig.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-07-11 18:01:05 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-07-11 18:01:05 (GMT)
commit2c92c3ca18ca65ee0bf1e02235ba668808d39030 (patch)
treef599204e32d78623d7ca8eddb630f7ca8f9c5f45 /src/H5Fcontig.c
parent9f171c6addb7a28f920760d4e74948fdbc8a0553 (diff)
downloadhdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.zip
hdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.tar.gz
hdf5-2c92c3ca18ca65ee0bf1e02235ba668808d39030.tar.bz2
[svn-r7210] Purpose:
Refactoring code Description: Refactored "IS_H5FD_MPIO || IS_H5FD_MPIPOSIX || IS_H5FD_FPHDF5" combination of macros in many places into single IS_H5FD_MPI macro, which has the same definition, but should be easier to maintain. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest
Diffstat (limited to 'src/H5Fcontig.c')
-rw-r--r--src/H5Fcontig.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c
index 5427875..64a4377 100644
--- a/src/H5Fcontig.c
+++ b/src/H5Fcontig.c
@@ -31,23 +31,17 @@
#include "H5private.h" /* Generic Functions */
#include "H5Dprivate.h" /* Dataset functions */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fpkg.h"
-#include "H5FDprivate.h" /*file driver */
-#include "H5FLprivate.h" /*Free Lists */
-#include "H5MFprivate.h" /*file memory management */
+#include "H5Fpkg.h" /* Files */
+#include "H5FDprivate.h" /* File drivers */
+#include "H5FLprivate.h" /* Free Lists */
+#include "H5MFprivate.h" /* File memory management */
#include "H5Oprivate.h" /* Object headers */
#include "H5Pprivate.h" /* Property lists */
#include "H5Sprivate.h" /* Dataspace functions */
#include "H5Vprivate.h" /* Vector and array functions */
-/* MPIO, MPIPOSIX, & FPHDF5 drivers needed for special checks */
-#include "H5FDfphdf5.h"
-#include "H5FDmpio.h"
-#include "H5FDmpiposix.h"
-
/* Private prototypes */
-static herr_t
-H5F_contig_write(H5F_t *f, hsize_t max_data, haddr_t addr,
+static herr_t H5F_contig_write(H5F_t *f, hsize_t max_data, haddr_t addr,
const size_t size, hid_t dxpl_id, const void *buf);
/* Interface initialization */
@@ -158,7 +152,7 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
assert(elmt_size>0);
#ifdef H5_HAVE_PARALLEL
- /* Retrieve up MPI parameters */
+ /* Retrieve MPI parameters */
if(IS_H5FD_MPIO(f)) {
/* Get the MPI communicator */
if (MPI_COMM_NULL == (mpi_comm=H5FD_mpio_communicator(f->shared->lf)))
@@ -256,7 +250,7 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
#ifdef H5_HAVE_PARALLEL
/* Check if this file is accessed with an MPI-capable file driver */
if(using_mpi) {
- /* Round-robin write the chunks out from only one process */
+ /* Write the chunks out from only one process */
if(H5_PAR_META_WRITE==mpi_rank) {
if (H5F_contig_write(f, (hsize_t)size, addr, size, dxpl_id, buf)<0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to write fill value to dataset");