diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-07 13:32:32 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-07 13:32:32 (GMT) |
| commit | bdbdbb9f89db8d3a76fc71705cdbbd89124f4687 (patch) | |
| tree | 53d16d2097c591d2c7094da6b8e2b23ef5663a0f /src/H5Cprivate.h | |
| parent | b256db872d5ce4f81c6486b60c4e29e8122b67c2 (diff) | |
| download | hdf5-bdbdbb9f89db8d3a76fc71705cdbbd89124f4687.zip hdf5-bdbdbb9f89db8d3a76fc71705cdbbd89124f4687.tar.gz hdf5-bdbdbb9f89db8d3a76fc71705cdbbd89124f4687.tar.bz2 | |
[svn-r15801] Description:
Bring r15800 back from trunk:
- File free space branch changes through r15794
Tested on:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) 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 production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Cprivate.h')
| -rw-r--r-- | src/H5Cprivate.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index b50227b..4ce321c 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -364,6 +364,11 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr, * destroy_in_progress: Boolean flag that is set to true iff the entry * is in the process of being flushed and destroyed. * + * free_file_space_on_destroy: Boolean flag that is set to true iff the entry + * is in the process of being flushed and destroyed and the file + * space used by the object should be freed by the cache client's + * 'dest' callback routine. + * * * Fields supporting the hash table: * @@ -489,6 +494,7 @@ typedef struct H5C_cache_entry_t #endif /* H5_HAVE_PARALLEL */ hbool_t flush_in_progress; hbool_t destroy_in_progress; + hbool_t free_file_space_on_destroy; /* fields supporting the hash table: */ @@ -893,7 +899,12 @@ typedef struct H5C_auto_size_ctl_t * H5C__SIZE_CHANGED_FLAG * H5C__PIN_ENTRY_FLAG * H5C__UNPIN_ENTRY_FLAG + * H5C__FREE_FILE_SPACE_FLAG + * H5C__TAKE_OWNERSHIP_FLAG + * + * These flags apply to H5C_expunge_entry(): * + * H5C__FREE_FILE_SPACE_FLAG * * These flags apply to H5C_flush_cache(): * @@ -908,6 +919,7 @@ typedef struct H5C_auto_size_ctl_t * H5C__FLUSH_INVALIDATE_FLAG * H5C__FLUSH_CLEAR_ONLY_FLAG * H5C__FLUSH_MARKED_ENTRIES_FLAG + * H5C__TAKE_OWNERSHIP_FLAG */ #define H5C__NO_FLAGS_SET 0x0000 @@ -922,6 +934,8 @@ typedef struct H5C_auto_size_ctl_t #define H5C__FLUSH_MARKED_ENTRIES_FLAG 0x0100 #define H5C__FLUSH_IGNORE_PROTECTED_FLAG 0x0200 #define H5C__READ_ONLY_FLAG 0x0400 +#define H5C__FREE_FILE_SPACE_FLAG 0x0800 +#define H5C__TAKE_OWNERSHIP_FLAG 0x1000 H5_DLL H5C_t * H5C_create(size_t max_cache_size, @@ -954,7 +968,8 @@ H5_DLL herr_t H5C_expunge_entry(H5F_t * f, hid_t secondary_dxpl_id, H5C_t * cache_ptr, const H5C_class_t * type, - haddr_t addr); + haddr_t addr, + unsigned flags); H5_DLL herr_t H5C_flush_cache(H5F_t * f, hid_t primary_dxpl_id, |