diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2004-06-08 15:26:04 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-06-08 15:26:04 (GMT) |
commit | 5c2b09a88ce07acb9fc04cf0945292140e1770d9 (patch) | |
tree | a17de415168aab7e39c33d41b47e042fca4683d0 /src/H5Distore.c | |
parent | 8b6abe7b2db42b95ca7caadf1deb97c628d5054b (diff) | |
download | hdf5-5c2b09a88ce07acb9fc04cf0945292140e1770d9.zip hdf5-5c2b09a88ce07acb9fc04cf0945292140e1770d9.tar.gz hdf5-5c2b09a88ce07acb9fc04cf0945292140e1770d9.tar.bz2 |
[svn-r8626] Purpose:
Code optimization
Description:
Avoid pushing errors on error stack when an object is not found in a B-tree.
Sometimes we are just checking if the object exists before we insert it into
the B-tree and the higher levels in the library should be responsible for
determining if not finding the object in B-tree is really an error.
Platforms tested:
Solaris 2.7 (arabica)
FreeBSD 4.10 (sleipnir) w/parallel
too minor to require h5committest
Diffstat (limited to 'src/H5Distore.c')
-rw-r--r-- | src/H5Distore.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/H5Distore.c b/src/H5Distore.c index 75433fd..96f161d 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1444,8 +1444,10 @@ H5D_istore_lock(H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id, } else { H5D_fill_value_t fill_status; +#ifdef OLD_WAY /* Clear the error stack from not finding the chunk on disk */ H5E_clear(); +#endif /* OLD_WAY */ /* Chunk size on disk isn't [likely] the same size as the final chunk * size in memory, so allocate memory big enough. */ @@ -2035,9 +2037,17 @@ H5D_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, /* Go get the chunk information */ if (H5B_find (f, dxpl_id, H5B_ISTORE, layout->u.chunk.addr, udata)<0) { + /* Note: don't push error on stack, leave that to next higher level, + * since many times the B-tree is searched in order to determine + * if a chunk exists in the B-tree or not. -QAK + */ +#ifdef OLD_WAY H5E_clear(); HGOTO_ERROR(H5E_BTREE,H5E_NOTFOUND,HADDR_UNDEF,"Can't locate chunk info"); +#else /* OLD_WAY */ + HGOTO_DONE(HADDR_UNDEF) +#endif /* OLD_WAY */ } /* end if */ /* Success! Set the return value */ |