diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 15:49:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-17 15:49:06 (GMT) |
| commit | 832305699d1ef7c43ac93bc83dc3bb724249f240 (patch) | |
| tree | 526437dadbe6e614580850327786adf9f46fed70 /src/H5B2dbg.c | |
| parent | 7fd5028f7ccfa34bec0e46c21113dbc664c4b850 (diff) | |
| download | hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.zip hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.tar.gz hdf5-832305699d1ef7c43ac93bc83dc3bb724249f240.tar.bz2 | |
[svn-r12589] Description:
Revert passing the v2 B-tree class to callbacks, it turns out to be
unnecessary. Also revert have a "class private" pointer for each v2 B-tree
class.
Add in support for the different flavors of fractal heap 'huge' objects
also.
Tested on:
FreeBSD/32 4.11 (sleipnir)
Linux/64 2.4 (mir)
Solaris/64 2.9 (shanti)
Diffstat (limited to 'src/H5B2dbg.c')
| -rw-r--r-- | src/H5B2dbg.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c index 88e6852..6f1799f 100644 --- a/src/H5B2dbg.c +++ b/src/H5B2dbg.c @@ -123,8 +123,12 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, */ HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:", - ((shared->type->id) == H5B2_TEST_ID ? "H5B2_TEST_ID" : - "Unknown!")); + (shared->type->id == H5B2_TEST_ID ? "H5B2_TEST_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_INDIR_ID ? "H5B2_FHEAP_HUGE_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_INDIR_ID ? "H5B2_FHEAP_HUGE_FILT_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_DIR_ID ? "H5B2_FHEAP_HUGE_DIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_DIR_ID ? "H5B2_FHEAP_HUGE_FILT_DIR_ID" : + "Unknown!")))))); HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", shared->node_size); @@ -246,8 +250,12 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, */ HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:", - ((shared->type->id)==H5B2_TEST_ID ? "H5B2_TEST_ID" : - "Unknown!")); + (shared->type->id == H5B2_TEST_ID ? "H5B2_TEST_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_INDIR_ID ? "H5B2_FHEAP_HUGE_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_INDIR_ID ? "H5B2_FHEAP_HUGE_FILT_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_DIR_ID ? "H5B2_FHEAP_HUGE_DIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_DIR_ID ? "H5B2_FHEAP_HUGE_FILT_DIR_ID" : + "Unknown!")))))); HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", shared->node_size); @@ -277,7 +285,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, temp_str); HDassert(H5B2_INT_NREC(internal, shared, u)); (void)(type->debug)(stream, f, dxpl_id, indent + 6, MAX (0, fwidth-6), - shared->type, H5B2_INT_NREC(internal,shared,u), NULL); + H5B2_INT_NREC(internal,shared,u), NULL); } /* end for */ /* Print final node pointer */ @@ -363,8 +371,12 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, */ HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Tree type ID:", - ((shared->type->id)==H5B2_TEST_ID ? "H5B2_TEST_ID" : - "Unknown!")); + (shared->type->id == H5B2_TEST_ID ? "H5B2_TEST_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_INDIR_ID ? "H5B2_FHEAP_HUGE_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_INDIR_ID ? "H5B2_FHEAP_HUGE_FILT_INDIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_DIR_ID ? "H5B2_FHEAP_HUGE_DIR_ID" : + (shared->type->id == H5B2_FHEAP_HUGE_FILT_DIR_ID ? "H5B2_FHEAP_HUGE_FILT_DIR_ID" : + "Unknown!")))))); HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of node:", shared->node_size); @@ -386,7 +398,7 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, temp_str); HDassert(H5B2_LEAF_NREC(leaf, shared, u)); (void)(type->debug)(stream, f, dxpl_id, indent+6, MAX (0, fwidth-6), - shared->type, H5B2_LEAF_NREC(leaf,shared,u), NULL); + H5B2_LEAF_NREC(leaf,shared,u), NULL); } /* end for */ done: |