diff options
| author | Richard Warren <Richard.Warren@hdfgroup.org> | 2018-04-20 23:36:57 (GMT) |
|---|---|---|
| committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2018-04-20 23:36:57 (GMT) |
| commit | 0449b05d75fa8641b465f0dc05a6ee13a3f5e3d0 (patch) | |
| tree | 2c1638bde7ce7ea0f3d95e6fd74fdd498e82fe67 | |
| parent | 92d30a93d3cd7b61f91c524a698c32312e0aa152 (diff) | |
| download | hdf5-0449b05d75fa8641b465f0dc05a6ee13a3f5e3d0.zip hdf5-0449b05d75fa8641b465f0dc05a6ee13a3f5e3d0.tar.gz hdf5-0449b05d75fa8641b465f0dc05a6ee13a3f5e3d0.tar.bz2 | |
Changes to reflect feedback of the initial PR review
| -rw-r--r-- | release_docs/RELEASE.txt | 3 | ||||
| -rw-r--r-- | src/H5AC.c | 7 | ||||
| -rw-r--r-- | src/H5Cmpio.c | 5 | ||||
| -rw-r--r-- | src/H5Dio.c | 4 |
4 files changed, 7 insertions, 12 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 3a6f213..8b8117f 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -66,8 +66,7 @@ New Features ----------------- - Create VDS in parallel The creation, along with reading and writing of Virtual Data Sets (VDS) - is now supported. The initial coding was for version 1.10.1 by Neil Fortner, - but required additional validation and testing. + is now supported. (HDFFV-10287, RAW, 2018/04/18) @@ -661,16 +661,15 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id) #ifdef H5_HAVE_PARALLEL if(aux_ptr != NULL) { if(aux_ptr->d_slist_ptr != NULL) { - size_t count = H5SL_count(aux_ptr->d_slist_ptr); - HDassert(count >= 0); + HDassert(H5SL_count(aux_ptr->d_slist_ptr) == 0); H5SL_close(aux_ptr->d_slist_ptr); } /* end if */ if(aux_ptr->c_slist_ptr != NULL) { - HDassert(H5SL_count(aux_ptr->c_slist_ptr) >= 0); + HDassert(H5SL_count(aux_ptr->c_slist_ptr) == 0); H5SL_close(aux_ptr->c_slist_ptr); } /* end if */ if(aux_ptr->candidate_slist_ptr != NULL) { - HDassert(H5SL_count(aux_ptr->candidate_slist_ptr) >= 0); + HDassert(H5SL_count(aux_ptr->candidate_slist_ptr) == 0); H5SL_close(aux_ptr->candidate_slist_ptr); } /* end if */ aux_ptr->magic = 0; diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index 8d3d1c6..a75cd88 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -1326,9 +1326,6 @@ H5C__flush_candidates_in_ring(H5F_t *f, hid_t dxpl_id, H5C_ring_t ring, #if H5C_DO_SANITY_CHECKS /* index len should not change */ init_index_len = cache_ptr->index_len; - if(H5C_get_aux_ptr(f->shared->cache)) - init_index_len++; /* parallel ops may add an additional - * operation for a heap entry if VDS... */ #endif /* H5C_DO_SANITY_CHECKS */ /* Examine entries in the LRU list, and flush or clear all entries @@ -1614,7 +1611,7 @@ H5C__flush_candidates_in_ring(H5F_t *f, hid_t dxpl_id, H5C_ring_t ring, */ #if H5C_DO_SANITY_CHECKS - HDassert(init_index_len >= cache_ptr->index_len); + HDassert(init_index_len == cache_ptr->index_len); #endif /* H5C_DO_SANITY_CHECKS */ if(entries_flushed != entries_to_flush || entries_cleared != entries_to_clear) { diff --git a/src/H5Dio.c b/src/H5Dio.c index 66356c0..aee3c35 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -427,7 +427,7 @@ H5D__read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, /* Note that if this variable is used, the */ /* projected mem space must be discarded at the */ /* end of the function to avoid a memory leak. */ - H5D_storage_t store = {0,}; /*union of EFL and chunk pointer in file space */ + H5D_storage_t store; /*union of EFL and chunk pointer in file space */ hssize_t snelmts; /*total number of elmts (signed) */ hsize_t nelmts; /*total number of elmts */ hbool_t io_info_init = FALSE; /* Whether the I/O info has been initialized */ @@ -637,7 +637,7 @@ H5D__write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space, const H5S_t *file_space, hid_t dxpl_id, const void *buf) { H5D_chunk_map_t *fm = NULL; /* Chunk file<->memory mapping */ - H5D_io_info_t io_info = {0,}; /* Dataset I/O info */ + H5D_io_info_t io_info; /* Dataset I/O info */ H5D_type_info_t type_info; /* Datatype info for operation */ hbool_t type_info_init = FALSE; /* Whether the datatype info has been initialized */ H5S_t * projected_mem_space = NULL; /* If not NULL, ptr to dataspace containing a */ |