diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-01 21:26:27 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-01 21:26:27 (GMT) |
commit | 55a945c985692dfd2c8e1b2915d413b1b704905a (patch) | |
tree | 9e2e2e79738a65b20c33dc6443e348b4421ba31a /src/H5F.c | |
parent | 732e64b335c7a16d0724a993d7f85f8b748e244c (diff) | |
download | hdf5-55a945c985692dfd2c8e1b2915d413b1b704905a.zip hdf5-55a945c985692dfd2c8e1b2915d413b1b704905a.tar.gz hdf5-55a945c985692dfd2c8e1b2915d413b1b704905a.tar.bz2 |
[svn-r17139] Description:
Bring r17138 from trunk into 1.8 branch:
Disable use of temporary file space allocation when using a parallel VFD,
until we've made changes to broadcast the new address of the metadata when it
is relocated down into 'normal' file space.
Tested on:
Mac OS X/32 10.5.8 (amazon)
(h5committested on trunk)
Diffstat (limited to 'src/H5F.c')
-rw-r--r-- | src/H5F.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -949,13 +949,23 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf) f->shared->maxaddr = H5FD_get_maxaddr(lf); if(!H5F_addr_defined(f->shared->maxaddr)) HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, NULL, "bad maximum address from VFD") - f->shared->tmp_addr = f->shared->maxaddr; if(H5FD_get_feature_flags(lf, &f->shared->feature_flags) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get feature flags from VFD") if(H5FD_get_fs_type_map(lf, f->shared->fs_type_map) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, NULL, "can't get free space type mapping from VFD") if(H5MF_init_merge_flags(f) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "problem initializing free space merge flags") + f->shared->tmp_addr = f->shared->maxaddr; + /* Disable temp. space allocation for parallel I/O (for now) */ + /* (When we've arranged to have the relocated metadata addresses (and + * sizes) broadcast during the "end of epoch" metadata operations, + * this can be enabled - QAK) + */ + /* (This should be disabled when the metadata journaling branch is + * merged into the trunk and journaling is enabled, at least until + * we make it work. - QAK) + */ + f->shared->use_tmp_space = !(IS_H5FD_MPI(f)); /* Bump superblock version if we are to use the latest version of the format */ if(f->shared->latest_format) |