diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-07 21:24:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-07 21:24:29 (GMT) |
| commit | d17d42acd0fbba4b3433937f448c99930553b038 (patch) | |
| tree | a6535d4c7f313315ad6e326ded953cdaf6df1ce9 /src/H5HFhdr.c | |
| parent | 4f289e5b9240807d9fa5561fd793981334a9f086 (diff) | |
| download | hdf5-d17d42acd0fbba4b3433937f448c99930553b038.zip hdf5-d17d42acd0fbba4b3433937f448c99930553b038.tar.gz hdf5-d17d42acd0fbba4b3433937f448c99930553b038.tar.bz2 | |
[svn-r12552] Description:
More tweaks on fractal heap statistics, to better separate information
about managed objects from information about "huge" objects.
Also, clean up some compiler warnings, etc. on 64-bit platforms & Windows.
Platforms tested:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago)
Diffstat (limited to 'src/H5HFhdr.c')
| -rw-r--r-- | src/H5HFhdr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index 1f3c79f..b93b8bf 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -529,8 +529,7 @@ HDfprintf(stderr, "%s; hdr->man_size = %Hu\n", FUNC, hdr->man_size); HDfprintf(stderr, "%s; hdr->total_man_free = %Hu\n", FUNC, hdr->total_man_free); #endif /* QAK */ - /* Set the total space in heap */ - hdr->total_size = new_size; + /* Set the total managed space in heap */ hdr->man_size = new_size; /* Adjust the free space in direct blocks */ @@ -906,7 +905,7 @@ HDfprintf(stderr, "%s: child_nrows = %u\n", FUNC, child_nrows); HDfprintf(stderr, "%s: Skipping indirect block row that is too small\n", FUNC); #endif /* QAK */ /* Compute # of rows needed in child indirect block */ - child_rows_needed = (H5V_log2_of2(min_dblock_size) - H5V_log2_of2(hdr->man_dtable.cparam.start_block_size)) + 2; + child_rows_needed = (H5V_log2_of2((uint32_t)min_dblock_size) - H5V_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size)) + 2; HDassert(child_rows_needed > child_nrows); child_entry = (next_row + (child_rows_needed - child_nrows)) * hdr->man_dtable.cparam.width; if(child_entry > (iblock->nrows * hdr->man_dtable.cparam.width)) @@ -1237,8 +1236,7 @@ HDfprintf(stderr, "%s: 'next block' iterator is ready\n", FUNC); HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator") } /* end if */ - /* Shrink heap size */ - hdr->total_size = hdr->std_size; + /* Shrink managed heap size */ hdr->man_size = 0; hdr->man_alloc_size = 0; |