diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-10-21 23:12:56 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-10-21 23:12:56 (GMT) |
commit | cf7f386fd42ad520f6d2f3fc1ad1706bba791ae0 (patch) | |
tree | 24ae78f045403d9f115ac1ee3467541fc6eab745 /src/H5B.c | |
parent | f1c8df81fa128fc8bd4eeba7e24dc74de41dd419 (diff) | |
download | hdf5-cf7f386fd42ad520f6d2f3fc1ad1706bba791ae0.zip hdf5-cf7f386fd42ad520f6d2f3fc1ad1706bba791ae0.tar.gz hdf5-cf7f386fd42ad520f6d2f3fc1ad1706bba791ae0.tar.bz2 |
[svn-r19659] Description:
Bring r19639:19658 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/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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, w/threadsafe, in production mode
Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
Mac OS X/32 10.6.4 (amazon) in debug mode
Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode
Diffstat (limited to 'src/H5B.c')
-rw-r--r-- | src/H5B.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -677,10 +677,6 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, if(H5AC_insert_entry(f, dxpl_id, H5AC_BT, addr, new_root_bt, H5AC__NO_FLAGS_SET) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to add old B-tree root node to cache") -#ifdef H5B_DEBUG - H5B_assert(f, dxpl_id, addr, type, udata); -#endif - done: if(ret_value < 0) if(new_root_bt && H5B_node_dest(new_root_bt) < 0) @@ -694,6 +690,11 @@ done: if(H5AC_unprotect(f, dxpl_id, H5AC_BT, split_bt_ud.addr, split_bt_ud.bt, split_bt_ud.cache_flags) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to unprotect new child") +#ifdef H5B_DEBUG + if(ret_value >= 0) + H5B_assert(f, dxpl_id, addr, type, udata); +#endif + FUNC_LEAVE_NOAPI(ret_value) } /* end H5B_insert() */ |