diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-02-25 20:20:16 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-02-25 20:20:16 (GMT) |
| commit | fd268dca96ea76ef0ec4425434502343ee2055d7 (patch) | |
| tree | e4ea7988d00c7a52eb47b451d035f92f1d084bc4 /src/H5Cpkg.h | |
| parent | 1b8c195eb7b277c6b39061b6acac2583a7ee100a (diff) | |
| parent | 321adc3a6f35e3e8f3b3c7be8680fcdff6660db6 (diff) | |
| download | hdf5-fd268dca96ea76ef0ec4425434502343ee2055d7.zip hdf5-fd268dca96ea76ef0ec4425434502343ee2055d7.tar.gz hdf5-fd268dca96ea76ef0ec4425434502343ee2055d7.tar.bz2 | |
Merge pull request #313 in HDFFV/hdf5 from merge_page_buffering_04 to develop
* commit '321adc3a6f35e3e8f3b3c7be8680fcdff6660db6':
Align w/incoming page buffering changes.
Diffstat (limited to 'src/H5Cpkg.h')
| -rw-r--r-- | src/H5Cpkg.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index 2474c3a..e72c81f 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -4294,8 +4294,8 @@ typedef struct H5C_tag_info_t { * page buffering, this is no longer viable, as we must finalize the on * disk image of all metadata much sooner. * - * This is handled by the H5FS_settle_raw_data_fsm() and - * H5FS_settle_meta_data_fsm() routines. As these calls are expensive, + * This is handled by the H5MF_settle_raw_data_fsm() and + * H5MF_settle_meta_data_FSM() routines. As these calls are expensive, * the following fields are used to track whether the target free space * managers are clean. * @@ -4887,7 +4887,7 @@ H5_DLL herr_t H5C__generate_cache_image(H5F_t *f, hid_t dxpl_id, H5C_t *cache_pt H5_DLL herr_t H5C__load_cache_image(H5F_t *f, hid_t dxpl_id); H5_DLL herr_t H5C__mark_flush_dep_serialized(H5C_cache_entry_t * entry_ptr); H5_DLL herr_t H5C__mark_flush_dep_unserialized(H5C_cache_entry_t * entry_ptr); -H5_DLL herr_t H5C__make_space_in_cache(H5F_t * f, hid_t dxpl_id, +H5_DLL herr_t H5C__make_space_in_cache(H5F_t * f, hid_t dxpl_id, size_t space_needed, hbool_t write_permitted); H5_DLL herr_t H5C__flush_marked_entries(H5F_t * f, hid_t dxpl_id); H5_DLL herr_t H5C__generate_image(H5F_t *f, H5C_t *cache_ptr, |