diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-06-18 18:37:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-06-18 18:37:49 (GMT) |
| commit | ed7658df795092d7bd50705cae4319adb5985289 (patch) | |
| tree | 78f3a1eb1e2fc5da697be2655b2f824710e5a6e1 /src/H5Dproxy.c | |
| parent | 879d58b86bacd743e75d78bed2c54f549aeb0a9d (diff) | |
| download | hdf5-ed7658df795092d7bd50705cae4319adb5985289.zip hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.gz hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.bz2 | |
[svn-r17085] Description:
Bring r17002:17084 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/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 debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dproxy.c')
| -rw-r--r-- | src/H5Dproxy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Dproxy.c b/src/H5Dproxy.c index 784f7e7..e888540 100644 --- a/src/H5Dproxy.c +++ b/src/H5Dproxy.c @@ -46,6 +46,7 @@ #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ +#include "H5MFprivate.h" /* File memory management */ /****************/ @@ -329,8 +330,9 @@ H5D_chunk_proxy_create(H5D_t *dset, hid_t dxpl_id, H5D_chunk_common_ud_t *udata, HDassert(dset); HDassert(ent); - /* Get the chunk proxy address & adjust for next address */ - ent->proxy_addr = H5F_GET_NEXT_PROXY_ADDR(dset->oloc.file); + /* Get a temp. address for chunk proxy */ + if(HADDR_UNDEF == (ent->proxy_addr = H5MF_alloc_tmp(dset->oloc.file, (hsize_t)1))) + HGOTO_ERROR(H5E_DATASET, H5E_NOSPACE, FAIL, "file allocation failed for chunk proxy") #ifdef QAK HDfprintf(stderr, "%s: ent->proxy_addr = %a\n", FUNC, ent->proxy_addr); #endif /* QAK */ |