summaryrefslogtreecommitdiffstats
path: root/test/cache_common.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-18 19:09:04 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-18 19:09:04 (GMT)
commit4e0e18dfa5aab1bf63e130c9569ffba83ce3697e (patch)
tree376f356a2d69eb6939c6aacbab8be276f96df7fc /test/cache_common.h
parent38df150e1635103c44ec4c89ee9eff43a61ebc84 (diff)
downloadhdf5-4e0e18dfa5aab1bf63e130c9569ffba83ce3697e.zip
hdf5-4e0e18dfa5aab1bf63e130c9569ffba83ce3697e.tar.gz
hdf5-4e0e18dfa5aab1bf63e130c9569ffba83ce3697e.tar.bz2
[svn-r18851] Description:
Bring r18837 from trunk to 1.8 branch: 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 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 (h5committested on trunk)
Diffstat (limited to 'test/cache_common.h')
-rw-r--r--test/cache_common.h97
1 files changed, 3 insertions, 94 deletions
diff --git a/test/cache_common.h b/test/cache_common.h
index 5791345..88cf6f9 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -384,81 +384,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;
@@ -618,7 +543,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,
@@ -653,7 +577,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);
@@ -664,7 +588,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,
@@ -678,8 +601,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,
@@ -688,7 +610,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,
@@ -702,8 +623,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,
@@ -712,7 +632,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,
@@ -722,7 +641,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,
@@ -732,7 +650,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,
@@ -742,7 +659,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,
@@ -760,15 +676,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,