diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-31 17:32:54 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-31 17:32:54 (GMT) |
| commit | a29e811343bce0275dc44671b767a2eebbf86593 (patch) | |
| tree | 11eec69c03676e21a4cbecb7dda280ac76fd1e73 /src/H5Dearray.c | |
| parent | 505b31ee08bfd3efc62df84e00602a9fd6c46a4f (diff) | |
| download | hdf5-a29e811343bce0275dc44671b767a2eebbf86593.zip hdf5-a29e811343bce0275dc44671b767a2eebbf86593.tar.gz hdf5-a29e811343bce0275dc44671b767a2eebbf86593.tar.bz2 | |
[svn-r16634] Description:
Bring r16618:16633 back from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.6 (amazon) in debug mode
Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dearray.c')
| -rw-r--r-- | src/H5Dearray.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dearray.c b/src/H5Dearray.c index 59df243..1f45bba 100644 --- a/src/H5Dearray.c +++ b/src/H5Dearray.c @@ -951,7 +951,7 @@ H5D_earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query extensible array statistics") /* Check if there are any array elements */ - if(ea_stat.max_idx_set > 0) { + if(ea_stat.stored.max_idx_set > 0) { H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */ hsize_t u; /* Local index variable */ @@ -962,7 +962,7 @@ H5D_earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, /* Loop over array elements */ /* (Note: this may be too simple for datasets with >1 dimension) */ - for(u = 0; u < ea_stat.max_idx_set; u++, chunk_rec.offset[0] += idx_info->layout->u.chunk.dim[0]) { + for(u = 0; u < ea_stat.stored.max_idx_set; u++, chunk_rec.offset[0] += idx_info->layout->u.chunk.dim[0]) { H5D_earray_filt_elmt_t elmt; /* Extensible array element */ /* Get the info about the chunk for the index */ @@ -990,7 +990,7 @@ H5D_earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, /* Loop over array elements */ /* (Note: this may be too simple for datasets with >1 dimension) */ - for(u = 0; u < ea_stat.max_idx_set; u++, chunk_rec.offset[0] += idx_info->layout->u.chunk.dim[0]) { + for(u = 0; u < ea_stat.stored.max_idx_set; u++, chunk_rec.offset[0] += idx_info->layout->u.chunk.dim[0]) { haddr_t addr; /* Chunk address */ /* Get the address of the chunk for the index */ @@ -1331,8 +1331,8 @@ H5D_earray_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't query extensible array statistics") /* Set the size of the extensible array */ - *index_size = ea_stat.hdr_size + ea_stat.index_blk_size - + ea_stat.super_blk_size + ea_stat.data_blk_size; + *index_size = ea_stat.computed.hdr_size + ea_stat.computed.index_blk_size + + ea_stat.stored.super_blk_size + ea_stat.stored.data_blk_size; done: if(idx_info->layout->u.chunk.u.earray.ea) { |