diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-10-05 21:01:10 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-10-05 21:01:10 (GMT) |
commit | 21943f5d35f98b35c3c0182d56f81b4854269dd6 (patch) | |
tree | a5024e9eb5ca6a40f07ae224fcf49d3f4782785c /src/H5Fistore.c | |
parent | 58ee080e72f4aa1e10bc7c3fcf5f6499aaad18e7 (diff) | |
download | hdf5-21943f5d35f98b35c3c0182d56f81b4854269dd6.zip hdf5-21943f5d35f98b35c3c0182d56f81b4854269dd6.tar.gz hdf5-21943f5d35f98b35c3c0182d56f81b4854269dd6.tar.bz2 |
[svn-r735] Changes since 19981002
----------------------
./src/H5D.c
Fill values are working for contiguous datasets now except
there are two things that need more support from the data
space layer, specifically the ability to form a selection from
the difference of two selections. They are (1) extending an
external contiguous dataset, (2) optimization by delaying the
fill until after the first H5Dwrite().
Renamed H5D_allocate() to H5D_init_storage() since allocation
is only part of the story. Added a data space argument so it
doesn't have to query the space from the object header -- the
space is always available in the caller anyway.
Removed `#ifdef HAVE_PARALLEL' from a few places where it
wasn't necessary. We don't need it around code that doesn't
compile anything from mpi.h or mpio.h.
./src/H5Fistore.c
Uncommented H5F_istore_alloc() for non-parallel and moved the
`#ifdef HAVE_PARALLEL' just around Kim's barrier.
./src/H5Fmpio.c
Wrapped a couple long lines.
Got rid of two signed vs. unsigned comparison warnings.
./MANIFEST
./test/Makefile.in
./test/fillval.c [NEW]
Added tests for fill values. The contiguous dataset extend
test is disabled until H5S_SELECT_DIFF is implemented.
./tools/Makefile.in
Fixed a bug where `make test' didn't build the executables
first. This should cause the snapshots to start up again.
./Makefile.in
Changed to build in `test' directory before `tools'
directory. We want the library tests to pass before we even
start considering the tools. You can still build and/or test
the tools independent of the library tests passing.
Diffstat (limited to 'src/H5Fistore.c')
-rw-r--r-- | src/H5Fistore.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 8c9dd1b..ed0659e 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -2001,7 +2001,6 @@ H5F_istore_debug(H5F_t *f, const haddr_t *addr, FILE * stream, intn indent, } -#ifdef HAVE_PARALLEL /*------------------------------------------------------------------------- * Function: H5F_istore_get_addr * @@ -2172,20 +2171,21 @@ H5F_istore_allocate (H5F_t *f, const H5O_layout_t *layout, if (carry) break; } +#ifdef HAVE_PARALLEL /* * rky 980923 - * The following barrier is a temporary fix to prevent overwriting - * real data caused by a race between one proc's call of H5F_istore_allocate - * (from H5D_allocate, ultimately from H5Dcreate and H5Dextend) - * and another proc's call of H5Dwrite. - * Eventually, this barrier should be removed, - * when H5D_allocate is changed to call H5MF_alloc directly + * + * The following barrier is a temporary fix to prevent overwriting real + * data caused by a race between one proc's call of H5F_istore_allocate + * (from H5D_init_storage, ultimately from H5Dcreate and H5Dextend) and + * another proc's call of H5Dwrite. Eventually, this barrier should be + * removed, when H5D_init_storage is changed to call H5MF_alloc directly * to allocate space, instead of calling H5F_istore_unlock. */ if (MPI_Barrier( f->shared->access_parms->u.mpio.comm )) { HRETURN_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Barrier failed"); } +#endif FUNC_LEAVE(SUCCEED); } -#endif |