diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-18 12:14:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-18 12:14:44 (GMT) |
| commit | 2fc65cf787c134a7c1d7c12d0a990c56d21d381e (patch) | |
| tree | ea6fa916e2b136579861f34ff026360758d44664 /test/cache_common.h | |
| parent | ef8cfc3e9f1fa4819e0e7dfffc7231c44365995c (diff) | |
| download | hdf5-2fc65cf787c134a7c1d7c12d0a990c56d21d381e.zip hdf5-2fc65cf787c134a7c1d7c12d0a990c56d21d381e.tar.gz hdf5-2fc65cf787c134a7c1d7c12d0a990c56d21d381e.tar.bz2 | |
[svn-r18837] Description:
Remove the size parameter from H5[A]C_unprotect() and the
H5[A]C__SIZE_CHANGED_FLAG, switching all clients & tests over to using
H5[A]C_resize_entry appropriately.
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/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'test/cache_common.h')
| -rw-r--r-- | test/cache_common.h | 97 |
1 files changed, 3 insertions, 94 deletions
diff --git a/test/cache_common.h b/test/cache_common.h index c86ef20..67228eb 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -413,81 +413,6 @@ if ( ( (cache_ptr) == NULL ) || \ /* misc type definitions */ -struct flush_cache_test_spec -{ - int entry_num; - int entry_type; - int entry_index; - hbool_t insert_flag; - hbool_t dirty_flag; - unsigned int flags; - hbool_t expected_loaded; - hbool_t expected_cleared; - hbool_t expected_flushed; - hbool_t expected_destroyed; -}; - -struct pe_flush_cache_test_spec -{ - int entry_num; - int entry_type; - int entry_index; - hbool_t insert_flag; - hbool_t dirty_flag; - unsigned int flags; - int num_pins; - int pin_type[MAX_PINS]; - int pin_idx[MAX_PINS]; - hbool_t expected_loaded; - hbool_t expected_cleared; - hbool_t expected_flushed; - hbool_t expected_destroyed; -}; - -struct fo_flush_entry_check -{ - int entry_num; - int entry_type; - int entry_index; - size_t expected_size; - hbool_t in_cache; - hbool_t at_main_addr; - hbool_t is_dirty; - hbool_t is_protected; - hbool_t is_pinned; - hbool_t expected_loaded; - hbool_t expected_cleared; - hbool_t expected_flushed; - hbool_t expected_destroyed; -}; - -struct fo_flush_cache_test_spec -{ - int entry_num; - int entry_type; - int entry_index; - hbool_t insert_flag; - unsigned int flags; - size_t new_size; - int num_pins; - int pin_type[MAX_PINS]; - int pin_idx[MAX_PINS]; - int num_flush_ops; - struct flush_op flush_ops[MAX_FLUSH_OPS]; - hbool_t expected_loaded; - hbool_t expected_cleared; - hbool_t expected_flushed; - hbool_t expected_destroyed; -}; - -struct move_entry_test_spec -{ - int entry_type; - int entry_index; - hbool_t is_dirty; - hbool_t is_pinned; -}; - struct expected_entry_status { int entry_type; @@ -664,7 +589,6 @@ void expunge_entry(H5F_t * file_ptr, void insert_entry(H5F_t * file_ptr, int32_t type, int32_t idx, - hbool_t dirty, unsigned int flags); void mark_entry_dirty(int32_t type, @@ -702,7 +626,7 @@ void resize_entry(H5F_t * file_ptr, int32_t type, int32_t idx, size_t new_size, - hbool_t resize_pin); + hbool_t in_cache); H5F_t *setup_cache(size_t max_cache_size, size_t min_clean_size); @@ -713,7 +637,6 @@ void row_major_scan_forward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, @@ -727,8 +650,7 @@ void hl_row_major_scan_forward(H5F_t * file_ptr, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, - hbool_t do_inserts, - hbool_t dirty_inserts); + hbool_t do_inserts); void row_major_scan_backward(H5F_t * file_ptr, int32_t lag, @@ -737,7 +659,6 @@ void row_major_scan_backward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, @@ -751,8 +672,7 @@ void hl_row_major_scan_backward(H5F_t * file_ptr, hbool_t reset_stats, hbool_t display_stats, hbool_t display_detailed_stats, - hbool_t do_inserts, - hbool_t dirty_inserts); + hbool_t do_inserts); void col_major_scan_forward(H5F_t * file_ptr, int32_t lag, @@ -761,7 +681,6 @@ void col_major_scan_forward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, int dirty_unprotects); void hl_col_major_scan_forward(H5F_t * file_ptr, @@ -771,7 +690,6 @@ void hl_col_major_scan_forward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, int dirty_unprotects); void col_major_scan_backward(H5F_t * file_ptr, @@ -781,7 +699,6 @@ void col_major_scan_backward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, int dirty_unprotects); void hl_col_major_scan_backward(H5F_t * file_ptr, @@ -791,7 +708,6 @@ void hl_col_major_scan_backward(H5F_t * file_ptr, hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t dirty_inserts, int dirty_unprotects); void takedown_cache(H5F_t * file_ptr, @@ -809,15 +725,8 @@ void unpin_entry(int32_t type, void unprotect_entry(H5F_t * file_ptr, int32_t type, int32_t idx, - int dirty, unsigned int flags); -void unprotect_entry_with_size_change(H5F_t * file_ptr, - int32_t type, - int32_t idx, - unsigned int flags, - size_t new_size); - void verify_clean(void); void verify_entry_status(H5C_t * cache_ptr, |