diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-05 17:52:31 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-05 17:52:31 (GMT) |
| commit | 0fb60ee7aeb183adcc188302b76b660aeaf8d41e (patch) | |
| tree | 1fd117d37351e6ac873164a2164dd481b218e193 /src/H5Doh.c | |
| parent | 888a002cddaa4e1d9a165ea01dfe62f399df9eb9 (diff) | |
| parent | 81c4e2133afafac614e21675c927ea5cca109083 (diff) | |
| download | hdf5-0fb60ee7aeb183adcc188302b76b660aeaf8d41e.zip hdf5-0fb60ee7aeb183adcc188302b76b660aeaf8d41e.tar.gz hdf5-0fb60ee7aeb183adcc188302b76b660aeaf8d41e.tar.bz2 | |
[svn-r27958] Description:
Reintegration merge of the VDS branch.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial & parallel
(daily tested for h5committest)
Diffstat (limited to 'src/H5Doh.c')
| -rw-r--r-- | src/H5Doh.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/H5Doh.c b/src/H5Doh.c index 057c904..f8a733d 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -398,6 +398,17 @@ H5O__dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) if(H5D__chunk_bh_info(f, dxpl_id, &layout, &pline, &(bh_info->index_size)) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine chunked dataset btree info") } /* end if */ + else if(layout.type == H5D_VIRTUAL + && (layout.storage.u.virt.serial_list_hobjid.addr != HADDR_UNDEF)) { + size_t virtual_heap_size; + + /* Get size of global heap object for virtual dataset */ + if(H5HG_get_obj_size(f, dxpl_id, &(layout.storage.u.virt.serial_list_hobjid), &virtual_heap_size) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get global heap size for virtual dataset mapping") + + /* Return heap size */ + bh_info->heap_size = (hsize_t)virtual_heap_size; + } /* end if */ /* Check for External File List message in the object header */ if((exists = H5O_msg_exists_oh(oh, H5O_EFL_ID)) < 0) |