summaryrefslogtreecommitdiffstats
path: root/tools/h5tools.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2000-11-29 17:39:09 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2000-11-29 17:39:09 (GMT)
commit7062c4889aa2d7528b48849204f9f42bab19858b (patch)
tree267a4bb55bb97f68173897d75d689a5a9c9a3a16 /tools/h5tools.c
parent19d811532a101399eed1a0f38d09574ee3c09001 (diff)
downloadhdf5-7062c4889aa2d7528b48849204f9f42bab19858b.zip
hdf5-7062c4889aa2d7528b48849204f9f42bab19858b.tar.gz
hdf5-7062c4889aa2d7528b48849204f9f42bab19858b.tar.bz2
[svn-r3021] Purpose:
Bug fix Description: Moving VL data reclamation to be more local to where the data is read in. Platforms tested: Linux 2.2.16-3smp (eirene)
Diffstat (limited to 'tools/h5tools.c')
-rw-r--r--tools/h5tools.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/tools/h5tools.c b/tools/h5tools.c
index 3244025..4e8290b 100644
--- a/tools/h5tools.c
+++ b/tools/h5tools.c
@@ -1126,14 +1126,6 @@ h5dump_sprint(h5dump_str_t *str/*in,out*/, const h5dump_t *info,
H5Tclose(memb);
- /* Create a datatype for reclaiming the memory */
- space=H5Screate(H5S_SCALAR);
-
- /* Reclaim the VL memory */
- H5Dvlen_reclaim(type,space,H5P_DEFAULT,cp_vp);
-
- /* Let the dataspace go */
- H5Sclose(space);
} else {
/* All other types get printed as hexadecimal */
unsigned int i;
@@ -1483,6 +1475,9 @@ h5dump_simple_dset(FILE *stream, const h5dump_t *info, hid_t dset,
hsize_t hs_size[H5S_MAX_RANK]; /*size this pass */
hsize_t hs_nelmts; /*elements in request */
+ /* VL data special information */
+ unsigned vl_data=0; /* Whether the dataset contains VL datatypes */
+
#if 0
hsize_t dim_n_size;
#endif
@@ -1519,6 +1514,10 @@ h5dump_simple_dset(FILE *stream, const h5dump_t *info, hid_t dset,
ctx.size_last_dim = total_size[ctx.ndims - 1];
+ /* Check if we have VL data in the dataset's datatype */
+ if(H5Tdetect_class(p_type,H5T_VLEN)==TRUE)
+ vl_data=TRUE;
+
/*
* Determine the strip mine size and allocate a buffer. The strip mine is
* a hyperslab whose size is manageable.
@@ -1571,6 +1570,10 @@ h5dump_simple_dset(FILE *stream, const h5dump_t *info, hid_t dset,
h5dump_simple_data(stream, info, dset, &ctx, flags, hs_nelmts,
p_type, sm_buf);
+ /* Reclaim any VL memory, if necessary */
+ if(vl_data)
+ H5Dvlen_reclaim(p_type,sm_space,H5P_DEFAULT,sm_buf);
+
/* Calculate the next hyperslab offset */
for (i = ctx.ndims, carry = 1; i > 0 && carry; --i) {
ctx.p_min_idx[i - 1] = ctx.p_max_idx[i - 1];