diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-26 22:06:57 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-26 22:06:57 (GMT) |
commit | 383f266ef1df526ea3ebeadd1b49099361ada7a9 (patch) | |
tree | a2246a7cffcdfdb362e914b09a9c63730f357ee0 /src/H5EAiblock.c | |
parent | f842a26c63ffe3fa24e6ab031f49c1aafcbc6ad2 (diff) | |
download | hdf5-383f266ef1df526ea3ebeadd1b49099361ada7a9.zip hdf5-383f266ef1df526ea3ebeadd1b49099361ada7a9.tar.gz hdf5-383f266ef1df526ea3ebeadd1b49099361ada7a9.tar.bz2 |
[svn-r16623] Description:
Revise how code for array statistics works.
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/H5EAiblock.c')
-rw-r--r-- | src/H5EAiblock.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c index 2d93015..b931661 100644 --- a/src/H5EAiblock.c +++ b/src/H5EAiblock.c @@ -178,7 +178,7 @@ END_FUNC(PKG) /* end H5EA__iblock_alloc() */ */ BEGIN_FUNC(PKG, ERR, haddr_t, HADDR_UNDEF, HADDR_UNDEF, -H5EA__iblock_create(H5EA_hdr_t *hdr, hid_t dxpl_id, hbool_t *hdr_dirty)) +H5EA__iblock_create(H5EA_hdr_t *hdr, hid_t dxpl_id, hbool_t *stats_changed)) /* Local variables */ H5EA_iblock_t *iblock = NULL; /* Extensible array index block */ @@ -190,7 +190,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC); /* Sanity check */ HDassert(hdr); - HDassert(hdr_dirty); + HDassert(stats_changed); /* Allocate the index block */ if(NULL == (iblock = H5EA__iblock_alloc(hdr))) @@ -235,16 +235,16 @@ HDfprintf(stderr, "%s: iblock->size = %Zu\n", FUNC, iblock->size); H5E_THROW(H5E_CANTINSERT, "can't add extensible array index block to cache") /* Update extensible array index block statistics */ - HDassert(0 == hdr->stats.nindex_blks); - HDassert(0 == hdr->stats.index_blk_size); - hdr->stats.nindex_blks = 1; - hdr->stats.index_blk_size = iblock->size; + HDassert(0 == hdr->stats.computed.nindex_blks); + HDassert(0 == hdr->stats.computed.index_blk_size); + hdr->stats.computed.nindex_blks = 1; + hdr->stats.computed.index_blk_size = iblock->size; /* Increment count of elements "realized" */ - hdr->stats.nelmts += hdr->cparam.idx_blk_elmts; + hdr->stats.stored.nelmts += hdr->cparam.idx_blk_elmts; - /* Mark the header dirty (for updating statistics) */ - *hdr_dirty = TRUE; + /* Mark the statistics as changed */ + *stats_changed = TRUE; /* Set address of index block to return */ ret_value = iblock_addr; |