diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-04-10 14:46:06 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-04-10 14:46:06 (GMT) |
| commit | ca9b25fd01867dcc0161942f490910761ec66877 (patch) | |
| tree | a189693c32a4b76cdf0c18ecc568ae558e033160 /src/H5Dchunk.c | |
| parent | ccb4e9ed9a5e0af27db9f1504a628e35d7f4cf92 (diff) | |
| parent | 7883c0d01b4eadba84697c7bb3322a304d242ed6 (diff) | |
| download | hdf5-ca9b25fd01867dcc0161942f490910761ec66877.zip hdf5-ca9b25fd01867dcc0161942f490910761ec66877.tar.gz hdf5-ca9b25fd01867dcc0161942f490910761ec66877.tar.bz2 | |
Merge pull request #4 in ~JHENDERSON/hdf5 from feature/parallel_filters to develop
* commit '7883c0d01b4eadba84697c7bb3322a304d242ed6': (38 commits)
Add comments
In current implementation, list must be gathered to all
Correct error with usage of array_gather function
Make array_gather routine more general
Updated comments
Add comments to H5D_filtered_collective_io_info_t data structure
Remove debugging statements
Revert "Merge latest changes from develop"
Merge latest changes from develop
removed erroneous casts from non-rvalue H5MM_free() calls. Replaced assignment of void return values with explicit value of NULL
Fix issue with uninitialized chunk index during chunk re-insertion into index
Remove potential infinite loops caused by goto in error label region
Remove note about src_type_size vs dst_type_size
Trigger error if library tries to break to independent I/O with filters in the pipeline
Fix issue in H5D__mpio_array_gather when no one contributes anything
Iterator for initial chunk entry IO operation should use source datatype size
Fix bug where data doesn't write correctly when MEMSPACE isnt the same as FILESPACE
Check return value of H5S_GET_EXTENT_NPOINTS macro
Fix macro complaint in H5Dmpio.c
Test code for user passing one-chunk-per-process hint to library
...
Diffstat (limited to 'src/H5Dchunk.c')
| -rw-r--r-- | src/H5Dchunk.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 63e692f..7e1906b 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -297,9 +297,6 @@ static herr_t H5D__chunk_unlock(const H5D_io_info_t *io_info, static herr_t H5D__chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *dxpl_cache, size_t size); static herr_t H5D__chunk_prune_fill(H5D_chunk_it_ud1_t *udata, hbool_t new_unfilt_chunk); -static herr_t H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, - const H5F_block_t *old_chunk, H5F_block_t *new_chunk, hbool_t *need_insert, - hsize_t scaled[]); #ifdef H5_HAVE_PARALLEL static herr_t H5D__chunk_collective_fill(const H5D_t *dset, hid_t dxpl_id, H5D_chunk_coll_info_t *chunk_info, size_t chunk_size, const void *fill_buf); @@ -6240,7 +6237,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +herr_t H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old_chunk, H5F_block_t *new_chunk, hbool_t *need_insert, hsize_t scaled[]) { |