mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
[svn-r27084] Description:
Clean up cache tests, to align w/v3 metadata cache changes
Tested on:
MacOSX/64 10.10.3 (amazon) w/serial & parallel
Linux/32 2.6.* (jam) w/serial & parallel
This commit is contained in:
Quincey Koziol
parent
20aa560825
commit
8be8a708a3
@ -2348,7 +2348,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
|
||||
unsigned long iul = va_arg(ap, unsigned long); /*lint !e732 Loss of sign not really occuring */
|
||||
|
||||
fprintf(out, "%lu", iul);
|
||||
asize[argno] = iul;
|
||||
asize[argno] = (hssize_t)iul;
|
||||
} /* end else */
|
||||
break;
|
||||
|
||||
@ -2372,7 +2372,7 @@ H5_trace(const double *returning, const char *func, const char *type, ...)
|
||||
unsigned long long iull = va_arg(ap, unsigned long long); /*lint !e732 Loss of sign not really occuring */
|
||||
|
||||
fprintf(out, "%llu", iull);
|
||||
asize[argno] = iull;
|
||||
asize[argno] = (hssize_t)iull;
|
||||
} /* end else */
|
||||
break;
|
||||
|
||||
|
||||
1342
test/cache.c
1342
test/cache.c
File diff suppressed because it is too large
Load Diff
@ -32,15 +32,15 @@
|
||||
|
||||
/* private function declarations: */
|
||||
|
||||
static void check_fapl_mdc_api_calls(void);
|
||||
static unsigned check_fapl_mdc_api_calls(void);
|
||||
|
||||
static void check_file_mdc_api_calls(void);
|
||||
static unsigned check_file_mdc_api_calls(void);
|
||||
|
||||
static void mdc_api_call_smoke_check(int express_test);
|
||||
static unsigned mdc_api_call_smoke_check(int express_test);
|
||||
|
||||
static void check_fapl_mdc_api_errs(void);
|
||||
static unsigned check_fapl_mdc_api_errs(void);
|
||||
|
||||
static void check_file_mdc_api_errs(void);
|
||||
static unsigned check_file_mdc_api_errs(void);
|
||||
|
||||
|
||||
/**************************************************************************/
|
||||
@ -67,7 +67,7 @@ static void check_file_mdc_api_errs(void);
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
static void
|
||||
static unsigned
|
||||
check_fapl_mdc_api_calls(void)
|
||||
{
|
||||
const char * fcn_name = "check_fapl_mdc_api_calls()";
|
||||
@ -489,6 +489,8 @@ check_fapl_mdc_api_calls(void)
|
||||
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
|
||||
fcn_name, failure_mssg);
|
||||
|
||||
return !pass;
|
||||
|
||||
} /* check_fapl_mdc_api_calls() */
|
||||
|
||||
|
||||
@ -516,7 +518,7 @@ check_fapl_mdc_api_calls(void)
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
static void
|
||||
static unsigned
|
||||
check_file_mdc_api_calls(void)
|
||||
{
|
||||
const char * fcn_name = "check_file_mdc_api_calls()";
|
||||
@ -839,6 +841,8 @@ check_file_mdc_api_calls(void)
|
||||
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
|
||||
fcn_name, failure_mssg);
|
||||
|
||||
return !pass;
|
||||
|
||||
} /* check_file_mdc_api_calls() */
|
||||
|
||||
|
||||
@ -865,7 +869,7 @@ check_file_mdc_api_calls(void)
|
||||
#define NUM_DSETS 6
|
||||
#define NUM_RANDOM_ACCESSES 200000
|
||||
|
||||
static void
|
||||
static unsigned
|
||||
mdc_api_call_smoke_check(int express_test)
|
||||
{
|
||||
const char * fcn_name = "mdc_api_call_smoke_check()";
|
||||
@ -1004,7 +1008,7 @@ mdc_api_call_smoke_check(int express_test)
|
||||
|
||||
HDfprintf(stdout, " Long tests disabled.\n");
|
||||
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
pass = TRUE;
|
||||
@ -1105,7 +1109,7 @@ mdc_api_call_smoke_check(int express_test)
|
||||
|
||||
sprintf(dset_name, "/dset%03d", i);
|
||||
dataset_ids[i] = H5Dcreate2(file_id, dset_name, H5T_STD_I32BE,
|
||||
dataspace_id, H5P_DEFAULT, properties, H5P_DEFAULT);
|
||||
dataspace_id, H5P_DEFAULT, properties, H5P_DEFAULT);
|
||||
|
||||
if ( dataset_ids[i] < 0 ) {
|
||||
|
||||
@ -1329,9 +1333,9 @@ mdc_api_call_smoke_check(int express_test)
|
||||
}
|
||||
|
||||
n++;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* close the file spaces we are done with */
|
||||
i = 1;
|
||||
while ( ( pass ) && ( i < NUM_DSETS ) )
|
||||
@ -1450,7 +1454,6 @@ mdc_api_call_smoke_check(int express_test)
|
||||
}
|
||||
|
||||
n++;
|
||||
|
||||
}
|
||||
|
||||
/* close file space 0 */
|
||||
@ -1515,6 +1518,8 @@ mdc_api_call_smoke_check(int express_test)
|
||||
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
|
||||
fcn_name, failure_mssg);
|
||||
|
||||
return !pass;
|
||||
|
||||
} /* mdc_api_call_smoke_check() */
|
||||
|
||||
|
||||
@ -3015,7 +3020,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
static void
|
||||
static unsigned
|
||||
check_fapl_mdc_api_errs(void)
|
||||
{
|
||||
const char * fcn_name = "check_fapl_mdc_api_errs()";
|
||||
@ -3065,7 +3070,7 @@ check_fapl_mdc_api_errs(void)
|
||||
|
||||
scratch.version = H5C__CURR_AUTO_SIZE_CTL_VER;
|
||||
if ( ( pass ) &&
|
||||
( ( H5Pget_mdc_config(fapl_id, &scratch) < 0 ) ||
|
||||
( ( H5Pget_mdc_config(fapl_id, &scratch) < 0) ||
|
||||
( !CACHE_CONFIGS_EQUAL(default_config, scratch, TRUE, TRUE) ) ) ) {
|
||||
|
||||
pass = FALSE;
|
||||
@ -3167,6 +3172,8 @@ check_fapl_mdc_api_errs(void)
|
||||
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
|
||||
fcn_name, failure_mssg);
|
||||
|
||||
return !pass;
|
||||
|
||||
} /* check_fapl_mdc_api_errs() */
|
||||
|
||||
|
||||
@ -3186,7 +3193,7 @@ check_fapl_mdc_api_errs(void)
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
static void
|
||||
static unsigned
|
||||
check_file_mdc_api_errs(void)
|
||||
{
|
||||
const char * fcn_name = "check_file_mdc_api_errs()";
|
||||
@ -3504,6 +3511,8 @@ check_file_mdc_api_errs(void)
|
||||
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
|
||||
fcn_name, failure_mssg);
|
||||
|
||||
return !pass;
|
||||
|
||||
} /* check_file_mdc_api_errs() */
|
||||
|
||||
|
||||
@ -3527,28 +3536,35 @@ check_file_mdc_api_errs(void)
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
unsigned nerrs = 0;
|
||||
int express_test;
|
||||
|
||||
H5open();
|
||||
|
||||
express_test = GetTestExpress();
|
||||
|
||||
printf("===================================\n");
|
||||
printf("Cache API tests\n");
|
||||
printf(" express_test = %d\n", express_test);
|
||||
printf("===================================\n");
|
||||
|
||||
|
||||
#if 1
|
||||
check_fapl_mdc_api_calls();
|
||||
nerrs += check_fapl_mdc_api_calls();
|
||||
#endif
|
||||
#if 1
|
||||
check_file_mdc_api_calls();
|
||||
nerrs += check_file_mdc_api_calls();
|
||||
#endif
|
||||
#if 1
|
||||
mdc_api_call_smoke_check(express_test);
|
||||
nerrs += mdc_api_call_smoke_check(express_test);
|
||||
#endif
|
||||
#if 1
|
||||
check_fapl_mdc_api_errs();
|
||||
nerrs += check_fapl_mdc_api_errs();
|
||||
#endif
|
||||
#if 1
|
||||
check_file_mdc_api_errs();
|
||||
nerrs += check_file_mdc_api_errs();
|
||||
#endif
|
||||
|
||||
return(0);
|
||||
return( nerrs > 0 );
|
||||
|
||||
} /* main() */
|
||||
|
||||
@ -151,7 +151,7 @@ static herr_t notify_size(H5F_t * f, void * thing, size_t * size_ptr);
|
||||
|
||||
static herr_t notify_notify(H5C_notify_action_t action, void *thing);
|
||||
|
||||
test_entry_t * entries[NUMBER_OF_ENTRY_TYPES] =
|
||||
test_entry_t *entries[NUMBER_OF_ENTRY_TYPES] =
|
||||
{
|
||||
pico_entries,
|
||||
nano_entries,
|
||||
@ -166,7 +166,7 @@ test_entry_t * entries[NUMBER_OF_ENTRY_TYPES] =
|
||||
notify_entries
|
||||
};
|
||||
|
||||
test_entry_t * orig_entries[NUMBER_OF_ENTRY_TYPES] =
|
||||
test_entry_t *orig_entries[NUMBER_OF_ENTRY_TYPES] =
|
||||
{
|
||||
orig_pico_entries,
|
||||
orig_nano_entries,
|
||||
@ -241,7 +241,7 @@ const haddr_t alt_base_addrs[NUMBER_OF_ENTRY_TYPES] =
|
||||
NOTIFY_ALT_BASE_ADDR
|
||||
};
|
||||
|
||||
const char * entry_type_names[NUMBER_OF_ENTRY_TYPES] =
|
||||
const char *entry_type_names[NUMBER_OF_ENTRY_TYPES] =
|
||||
{
|
||||
"pico entries -- 1 B",
|
||||
"nano entries -- 4 B",
|
||||
@ -375,7 +375,7 @@ static void execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr,
|
||||
|
||||
|
||||
|
||||
/* address translation funtions: */
|
||||
/* address translation functions: */
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
@ -393,8 +393,8 @@ static void execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr,
|
||||
*/
|
||||
void
|
||||
addr_to_type_and_index(haddr_t addr,
|
||||
int32_t * type_ptr,
|
||||
int32_t * index_ptr)
|
||||
int32_t *type_ptr,
|
||||
int32_t *index_ptr)
|
||||
{
|
||||
int i;
|
||||
int32_t type;
|
||||
@ -453,52 +453,8 @@ addr_to_type_and_index(haddr_t addr,
|
||||
|
||||
} /* addr_to_type_and_index() */
|
||||
|
||||
|
||||
#if 0 /* This function has never been used, but we may want it
|
||||
* some time. Lets keep it for now.
|
||||
*/
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: type_and_index_to_addr
|
||||
*
|
||||
* Purpose: Given a type and index of an entry, compute the associated
|
||||
* addr and return that value.
|
||||
*
|
||||
* Return: computed addr
|
||||
*
|
||||
* Programmer: John Mainzer
|
||||
* 6/10/04
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
haddr_t
|
||||
type_and_index_to_addr(int32_t type,
|
||||
int32_t idx)
|
||||
{
|
||||
haddr_t addr;
|
||||
|
||||
HDassert( ( type >= 0 ) && ( type < NUMBER_OF_ENTRY_TYPES ) );
|
||||
HDassert( ( idx >= 0 ) && ( idx <= max_indices[type] ) );
|
||||
|
||||
addr = base_addrs[type] + (((haddr_t)idx) * entry_sizes[type]);
|
||||
|
||||
HDassert( addr == (entries[type])[idx].addr );
|
||||
|
||||
if ( (entries[type])[idx].at_main_addr ) {
|
||||
|
||||
HDassert( addr == (entries[type])[idx].main_addr );
|
||||
|
||||
} else {
|
||||
|
||||
HDassert( addr == (entries[type])[idx].alt_addr );
|
||||
}
|
||||
|
||||
return(addr);
|
||||
|
||||
} /* type_and_index_to_addr() */
|
||||
|
||||
#endif
|
||||
/* Call back functions: */
|
||||
|
||||
|
||||
/*-------------------------------------------------------------------------
|
||||
@ -522,9 +478,9 @@ type_and_index_to_addr(int32_t type,
|
||||
*/
|
||||
|
||||
herr_t
|
||||
check_write_permitted(const H5F_t UNUSED * f,
|
||||
check_write_permitted(const H5F_t UNUSED *f,
|
||||
hid_t UNUSED dxpl_id,
|
||||
hbool_t * write_permitted_ptr)
|
||||
hbool_t *write_permitted_ptr)
|
||||
{
|
||||
|
||||
HDassert( write_permitted_ptr );
|
||||
@ -1273,14 +1229,13 @@ notify_size(H5F_t * f, void * thing, size_t * size_ptr)
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
static herr_t
|
||||
notify(H5C_notify_action_t action, void *thing)
|
||||
{
|
||||
test_entry_t * entry_ptr;
|
||||
test_entry_t * base_addr;
|
||||
test_entry_t *base_addr;
|
||||
|
||||
HDassert( thing );
|
||||
HDassert(thing);
|
||||
|
||||
entry_ptr = (test_entry_t *)thing;
|
||||
base_addr = entries[entry_ptr->type];
|
||||
@ -1642,8 +1597,7 @@ execute_flush_op(H5F_t * file_ptr,
|
||||
break;
|
||||
|
||||
case FLUSH_OP__MOVE:
|
||||
move_entry(cache_ptr, op_ptr->type, op_ptr->idx,
|
||||
op_ptr->flag);
|
||||
move_entry(cache_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
|
||||
break;
|
||||
|
||||
case FLUSH_OP__ORDER:
|
||||
@ -1745,8 +1699,8 @@ reset_entries(void)
|
||||
{
|
||||
int j;
|
||||
|
||||
max_index = max_indices[i];
|
||||
entry_size = entry_sizes[i];
|
||||
max_index = max_indices[i];
|
||||
base_addr = entries[i];
|
||||
orig_base_addr = orig_entries[i];
|
||||
|
||||
@ -2693,7 +2647,6 @@ setup_cache(size_t max_cache_size,
|
||||
cache_ptr->ignore_tags = TRUE;
|
||||
|
||||
H5C_stats__reset(cache_ptr);
|
||||
|
||||
ret_val = file_ptr;
|
||||
}
|
||||
|
||||
@ -2888,32 +2841,25 @@ flush_cache(H5F_t * file_ptr,
|
||||
verify_unprotected();
|
||||
|
||||
if(pass) {
|
||||
H5C_t * cache_ptr = NULL;
|
||||
H5C_t * cache_ptr;
|
||||
herr_t result = 0;
|
||||
|
||||
HDassert(file_ptr);
|
||||
|
||||
cache_ptr = file_ptr->shared->cache;
|
||||
|
||||
if(destroy_entries) {
|
||||
|
||||
if(destroy_entries)
|
||||
result = H5C_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
|
||||
H5P_DATASET_XFER_DEFAULT, H5C__FLUSH_INVALIDATE_FLAG);
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
else
|
||||
result = H5C_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT,
|
||||
H5P_DATASET_XFER_DEFAULT, H5C__NO_FLAGS_SET);
|
||||
}
|
||||
|
||||
if(dump_stats) {
|
||||
|
||||
if(dump_stats)
|
||||
H5C_stats(cache_ptr, "test cache", dump_detailed_stats);
|
||||
}
|
||||
|
||||
if(result < 0) {
|
||||
|
||||
pass = FALSE;
|
||||
failure_mssg = "error in H5C_flush_cache().";
|
||||
}
|
||||
@ -3016,24 +2962,19 @@ insert_entry(H5F_t * file_ptr,
|
||||
(int)(entry_ptr->addr != entry_ptr->header.addr));
|
||||
#endif
|
||||
}
|
||||
HDassert( entry_ptr->cache_ptr == NULL );
|
||||
HDassert(entry_ptr->cache_ptr == NULL);
|
||||
|
||||
entry_ptr->cache_ptr = cache_ptr;
|
||||
|
||||
if ( insert_pinned ) {
|
||||
|
||||
HDassert( entry_ptr->header.is_pinned );
|
||||
|
||||
} else {
|
||||
|
||||
HDassert( ! ( entry_ptr->header.is_pinned ) );
|
||||
|
||||
}
|
||||
if(insert_pinned)
|
||||
HDassert(entry_ptr->header.is_pinned);
|
||||
else
|
||||
HDassert(!(entry_ptr->header.is_pinned));
|
||||
entry_ptr->is_pinned = insert_pinned;
|
||||
entry_ptr->pinned_from_client = insert_pinned;
|
||||
|
||||
HDassert( entry_ptr->header.is_dirty );
|
||||
HDassert( ((entry_ptr->header).type)->id == type );
|
||||
HDassert(entry_ptr->header.is_dirty);
|
||||
HDassert(((entry_ptr->header).type)->id == type);
|
||||
}
|
||||
|
||||
return;
|
||||
@ -3541,8 +3482,8 @@ unprotect_entry(H5F_t * file_ptr,
|
||||
HDassert( entry_ptr->header.is_protected );
|
||||
HDassert( entry_ptr->is_protected );
|
||||
|
||||
pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0 );
|
||||
unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0 );
|
||||
pin_flag_set = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0);
|
||||
unpin_flag_set = (hbool_t)((flags & H5C__UNPIN_ENTRY_FLAG) != 0);
|
||||
|
||||
HDassert ( ! ( pin_flag_set && unpin_flag_set ) );
|
||||
HDassert ( ( ! pin_flag_set ) || ( ! (entry_ptr->is_pinned) ) );
|
||||
@ -3586,13 +3527,13 @@ unprotect_entry(H5F_t * file_ptr,
|
||||
|
||||
if ( pin_flag_set ) {
|
||||
|
||||
HDassert ( entry_ptr->header.is_pinned );
|
||||
HDassert(entry_ptr->header.is_pinned);
|
||||
entry_ptr->pinned_from_client = TRUE;
|
||||
entry_ptr->is_pinned = TRUE;
|
||||
|
||||
} else if ( unpin_flag_set ) {
|
||||
|
||||
HDassert ( entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache );
|
||||
HDassert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache);
|
||||
entry_ptr->pinned_from_client = FALSE;
|
||||
entry_ptr->is_pinned = entry_ptr->pinned_from_cache;
|
||||
|
||||
@ -4245,7 +4186,7 @@ row_major_scan_backward(H5F_t * file_ptr,
|
||||
if ( ( pass ) && ( (idx + lag) >= 0 ) &&
|
||||
( ( idx + lag) <= max_indices[type] ) ) {
|
||||
|
||||
switch ( (idx + lag) %4 ) {
|
||||
switch ( (idx + lag) % 4 ) {
|
||||
|
||||
case 0:
|
||||
if ( (entries[type])[idx+lag].is_dirty ) {
|
||||
@ -4274,7 +4215,7 @@ row_major_scan_backward(H5F_t * file_ptr,
|
||||
}
|
||||
break;
|
||||
|
||||
case 3: /* we just did an insrt */
|
||||
case 3: /* we just did an insert */
|
||||
unprotect_entry(file_ptr, type, idx + lag, H5C__DELETED_FLAG);
|
||||
break;
|
||||
|
||||
@ -5113,7 +5054,6 @@ check_and_validate_cache_hit_rate(hid_t file_id,
|
||||
int64_t min_accesses,
|
||||
double min_hit_rate)
|
||||
{
|
||||
/* const char * fcn_name = "check_and_validate_cache_hit_rate()"; */
|
||||
herr_t result;
|
||||
int64_t cache_hits = 0;
|
||||
int64_t cache_accesses = 0;
|
||||
@ -5247,7 +5187,6 @@ check_and_validate_cache_size(hid_t file_id,
|
||||
int32_t * cur_num_entries_ptr,
|
||||
hbool_t dump_data)
|
||||
{
|
||||
/* const char * fcn_name = "check_and_validate_cache_size()"; */
|
||||
herr_t result;
|
||||
size_t expected_max_size;
|
||||
size_t max_size;
|
||||
@ -5434,7 +5373,6 @@ validate_mdc_config(hid_t file_id,
|
||||
hbool_t compare_init,
|
||||
int test_num)
|
||||
{
|
||||
/* const char * fcn_name = "validate_mdc_config()"; */
|
||||
static char msg[256];
|
||||
H5F_t * file_ptr = NULL;
|
||||
H5C_t * cache_ptr = NULL;
|
||||
|
||||
@ -314,19 +314,19 @@ typedef struct test_entry_t
|
||||
hbool_t destroyed; /* entry has been destroyed since the
|
||||
* last time it was reset.
|
||||
*/
|
||||
int flush_dep_par_type; /* Entry type of flush dependency parent */
|
||||
int flush_dep_par_idx; /* Index of flush dependency parent */
|
||||
uint64_t child_flush_dep_height_rc[H5C__NUM_FLUSH_DEP_HEIGHTS];
|
||||
int flush_dep_par_type; /* Entry type of flush dependency parent */
|
||||
int flush_dep_par_idx; /* Index of flush dependency parent */
|
||||
uint64_t child_flush_dep_height_rc[H5C__NUM_FLUSH_DEP_HEIGHTS];
|
||||
/* flush dependency heights of flush
|
||||
* dependency children
|
||||
*/
|
||||
unsigned flush_dep_height; /* flush dependency height of entry */
|
||||
hbool_t pinned_from_client; /* entry was pinned by client call */
|
||||
hbool_t pinned_from_cache; /* entry was pinned by cache internally */
|
||||
unsigned flush_order; /* Order that entry was flushed in */
|
||||
unsigned flush_dep_height; /* flush dependency height of entry */
|
||||
hbool_t pinned_from_client; /* entry was pinned by client call */
|
||||
hbool_t pinned_from_cache; /* entry was pinned by cache internally */
|
||||
unsigned flush_order; /* Order that entry was flushed in */
|
||||
|
||||
unsigned notify_after_insert_count; /* Count of times that entry was inserted in cache */
|
||||
unsigned notify_before_evict_count; /* Count of times that entry was removed in cache */
|
||||
unsigned notify_after_insert_count; /* Count of times that entry was inserted in cache */
|
||||
unsigned notify_before_evict_count; /* Count of times that entry was removed in cache */
|
||||
} test_entry_t;
|
||||
|
||||
/* The following are cut down test versions of the hash table manipulation
|
||||
@ -410,6 +410,7 @@ if ( ( (cache_ptr) == NULL ) || \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
/* Macros used in H5AC level tests */
|
||||
|
||||
#define CACHE_CONFIGS_EQUAL(a, b, cmp_set_init, cmp_init_size) \
|
||||
@ -424,26 +425,26 @@ if ( ( (cache_ptr) == NULL ) || \
|
||||
( (a).set_initial_size == (b).set_initial_size ) ) && \
|
||||
( ( ! cmp_init_size ) || \
|
||||
( (a).initial_size == (b).initial_size ) ) && \
|
||||
( (a).min_clean_fraction == (b).min_clean_fraction ) && \
|
||||
( DBL_REL_EQUAL((a).min_clean_fraction, (b).min_clean_fraction, 0.00001 ) ) && \
|
||||
( (a).max_size == (b).max_size ) && \
|
||||
( (a).min_size == (b).min_size ) && \
|
||||
( (a).epoch_length == (b).epoch_length ) && \
|
||||
( (a).incr_mode == (b).incr_mode ) && \
|
||||
( (a).lower_hr_threshold == (b).lower_hr_threshold ) && \
|
||||
( (a).increment == (b).increment ) && \
|
||||
( DBL_REL_EQUAL((a).lower_hr_threshold, (b).lower_hr_threshold, 0.00001 ) ) && \
|
||||
( DBL_REL_EQUAL((a).increment, (b).increment, 0.00001 ) ) && \
|
||||
( (a).apply_max_increment == (b).apply_max_increment ) && \
|
||||
( (a).max_increment == (b).max_increment ) && \
|
||||
( (a).flash_incr_mode == (b).flash_incr_mode ) && \
|
||||
( (a).flash_multiple == (b).flash_multiple ) && \
|
||||
( (a).flash_threshold == (b).flash_threshold ) && \
|
||||
( DBL_REL_EQUAL((a).flash_multiple, (b).flash_multiple, 0.00001 ) ) && \
|
||||
( DBL_REL_EQUAL((a).flash_threshold, (b).flash_threshold, 0.00001 ) ) && \
|
||||
( (a).decr_mode == (b).decr_mode ) && \
|
||||
( (a).upper_hr_threshold == (b).upper_hr_threshold ) && \
|
||||
( (a).decrement == (b).decrement ) && \
|
||||
( DBL_REL_EQUAL((a).upper_hr_threshold, (b).upper_hr_threshold, 0.00001 ) ) && \
|
||||
( DBL_REL_EQUAL((a).decrement, (b).decrement, 0.00001 ) ) && \
|
||||
( (a).apply_max_decrement == (b).apply_max_decrement ) && \
|
||||
( (a).max_decrement == (b).max_decrement ) && \
|
||||
( (a).epochs_before_eviction == (b).epochs_before_eviction ) && \
|
||||
( (a).apply_empty_reserve == (b).apply_empty_reserve ) && \
|
||||
( (a).empty_reserve == (b).empty_reserve ) && \
|
||||
( DBL_REL_EQUAL((a).empty_reserve, (b).empty_reserve, 0.00001 ) ) && \
|
||||
( (a).dirty_bytes_threshold == (b).dirty_bytes_threshold ) && \
|
||||
( (a).metadata_write_strategy == (b).metadata_write_strategy ) )
|
||||
|
||||
@ -538,7 +539,6 @@ herr_t check_write_permitted(const H5F_t * f,
|
||||
hid_t dxpl_id,
|
||||
hbool_t * write_permitted_ptr);
|
||||
|
||||
|
||||
/* callback table extern */
|
||||
|
||||
extern const H5C_class_t types[NUMBER_OF_ENTRY_TYPES];
|
||||
|
||||
@ -117,91 +117,91 @@ print_entry_type_to_screen(int id)
|
||||
switch (id) {
|
||||
|
||||
case 0:
|
||||
printf("B-tree Node");
|
||||
printf("B-tree Node(0)");
|
||||
break;
|
||||
case 1:
|
||||
printf("Symbol Table Node");
|
||||
printf("Symbol Table Node(1)");
|
||||
break;
|
||||
case 2:
|
||||
printf("Local Heap Prefix");
|
||||
printf("Local Heap Prefix(2)");
|
||||
break;
|
||||
case 3:
|
||||
printf("Local Heap Data Block");
|
||||
printf("Local Heap Data Block(3)");
|
||||
break;
|
||||
case 4:
|
||||
printf("Global Heap");
|
||||
printf("Global Heap(4)");
|
||||
break;
|
||||
case 5:
|
||||
printf("Object Header");
|
||||
printf("Object Header(5)");
|
||||
break;
|
||||
case 6:
|
||||
printf("Object Header Chunk");
|
||||
printf("Object Header Chunk(6)");
|
||||
break;
|
||||
case 7:
|
||||
printf("v2 B-tree Header");
|
||||
printf("v2 B-tree Header(7)");
|
||||
break;
|
||||
case 8:
|
||||
printf("v2 B-tree Internal Node");
|
||||
printf("v2 B-tree Internal Node(8)");
|
||||
break;
|
||||
case 9:
|
||||
printf("v2 B-tree Leaf Node");
|
||||
printf("v2 B-tree Leaf Node(9)");
|
||||
break;
|
||||
case 10:
|
||||
printf("Fractal Heap Header");
|
||||
printf("Fractal Heap Header(10)");
|
||||
break;
|
||||
case 11:
|
||||
printf("Fractal Heap Direct Block");
|
||||
printf("Fractal Heap Direct Block(11)");
|
||||
break;
|
||||
case 12:
|
||||
printf("Fractal Heap Indirect Block");
|
||||
printf("Fractal Heap Indirect Block(12)");
|
||||
break;
|
||||
case 13:
|
||||
printf("Free Space Header");
|
||||
printf("Free Space Header(13)");
|
||||
break;
|
||||
case 14:
|
||||
printf("Free Space Section");
|
||||
printf("Free Space Section(14)");
|
||||
break;
|
||||
case 15:
|
||||
printf("Shared Object Header Message Master Table");
|
||||
printf("Shared Object Header Message Master Table(15)");
|
||||
break;
|
||||
case 16:
|
||||
printf("Shared Message Index Stored As A List");
|
||||
printf("Shared Message Index Stored As A List(16)");
|
||||
break;
|
||||
case 17:
|
||||
printf("Extensible Array Header");
|
||||
printf("Extensible Array Header(17)");
|
||||
break;
|
||||
case 18:
|
||||
printf("Extensible Array Index Block");
|
||||
printf("Extensible Array Index Block(18)");
|
||||
break;
|
||||
case 19:
|
||||
printf("Extensible Array Super Block");
|
||||
printf("Extensible Array Super Block(19)");
|
||||
break;
|
||||
case 20:
|
||||
printf("Extensible Array Data Block");
|
||||
printf("Extensible Array Data Block(20)");
|
||||
break;
|
||||
case 21:
|
||||
printf("Extensible Array Data Block Page");
|
||||
printf("Extensible Array Data Block Page(21)");
|
||||
break;
|
||||
case 22:
|
||||
printf("Chunk Proxy");
|
||||
printf("Chunk Proxy(22)");
|
||||
break;
|
||||
case 23:
|
||||
printf("Fixed Array Header");
|
||||
printf("Fixed Array Header(23)");
|
||||
break;
|
||||
case 24:
|
||||
printf("Fixed Array Data Block");
|
||||
printf("Fixed Array Data Block(24)");
|
||||
break;
|
||||
case 25:
|
||||
printf("Fixed Array Data Block Page");
|
||||
printf("Fixed Array Data Block Page(25)");
|
||||
break;
|
||||
case 26:
|
||||
printf("File Superblock");
|
||||
printf("File Superblock(26)");
|
||||
break;
|
||||
case 27:
|
||||
printf("Test Entry");
|
||||
printf("Test Entry(27)");
|
||||
break;
|
||||
case 28:
|
||||
printf("Number of Types");
|
||||
printf("Number of Types(28)");
|
||||
break;
|
||||
default:
|
||||
printf("*Unknown*");
|
||||
@ -434,7 +434,8 @@ static int verify_tag(hid_t fid, int id, haddr_t tag)
|
||||
|
||||
} /* for */
|
||||
|
||||
if (found == FALSE) TEST_ERROR;
|
||||
if (found == FALSE)
|
||||
TEST_ERROR;
|
||||
|
||||
return 0;
|
||||
|
||||
|
||||
@ -20,31 +20,22 @@
|
||||
|
||||
#include "h5test.h"
|
||||
#include "testpar.h"
|
||||
#include "H5Iprivate.h"
|
||||
#include "H5ACprivate.h"
|
||||
|
||||
#define H5C_PACKAGE /*suppress error about including H5Cpkg */
|
||||
|
||||
#include "H5Cpkg.h"
|
||||
|
||||
#define H5AC_PACKAGE /*suppress error about including H5ACpkg */
|
||||
|
||||
#include "H5ACpkg.h"
|
||||
|
||||
#define H5C_PACKAGE /*suppress error about including H5Cpkg */
|
||||
#define H5F_PACKAGE /*suppress error about including H5Fpkg */
|
||||
|
||||
#include "H5ACpkg.h"
|
||||
#include "H5Cpkg.h"
|
||||
#include "H5Fpkg.h"
|
||||
#include "H5Iprivate.h"
|
||||
|
||||
|
||||
|
||||
|
||||
int nerrors = 0;
|
||||
int failures = 0;
|
||||
hbool_t verbose = TRUE; /* used to control error messages */
|
||||
#if 0
|
||||
/* So far we haven't needed this, but that may change.
|
||||
* Keep it around for now
|
||||
*/
|
||||
hid_t noblock_dxpl_id=(-1);
|
||||
#endif
|
||||
|
||||
#define NFILENAME 2
|
||||
#define PARATESTFILE filenames[0]
|
||||
@ -169,7 +160,7 @@ struct datum
|
||||
hbool_t global_pinned;
|
||||
hbool_t local_pinned;
|
||||
hbool_t cleared;
|
||||
hbool_t flushed;
|
||||
hbool_t flushed;
|
||||
int reads;
|
||||
int writes;
|
||||
int index;
|
||||
@ -466,20 +457,20 @@ static hbool_t trace_file_check(int metadata_write_strategy);
|
||||
#ifdef NOT_USED
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: print_stats()
|
||||
* Function: print_stats()
|
||||
*
|
||||
* Purpose: Print the rudementary stats maintained by t_cache.
|
||||
* Purpose: Print the rudementary stats maintained by t_cache.
|
||||
*
|
||||
* This is a debugging function, which will not normally
|
||||
* be run as part of t_cache.
|
||||
* This is a debugging function, which will not normally
|
||||
* be run as part of t_cache.
|
||||
*
|
||||
* Return: void
|
||||
* Return: void
|
||||
*
|
||||
* Programmer: JRM -- 4/17/06
|
||||
* Programmer: JRM -- 4/17/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
@ -487,16 +478,16 @@ static void
|
||||
print_stats(void)
|
||||
{
|
||||
HDfprintf(stdout,
|
||||
"%d: datum clears / pinned clears / destroys = %ld / %ld / %ld\n",
|
||||
"%d: datum clears / pinned clears / destroys = %ld / %ld / %ld\n",
|
||||
world_mpi_rank, datum_clears, datum_pinned_clears,
|
||||
datum_destroys );
|
||||
datum_destroys );
|
||||
HDfprintf(stdout,
|
||||
"%d: datum flushes / pinned flushes / loads = %ld / %ld / %ld\n",
|
||||
"%d: datum flushes / pinned flushes / loads = %ld / %ld / %ld\n",
|
||||
world_mpi_rank, datum_flushes, datum_pinned_flushes,
|
||||
datum_loads );
|
||||
datum_loads );
|
||||
HDfprintf(stdout,
|
||||
"%d: pins: global / global dirty / local = %ld / %ld / %ld\n",
|
||||
world_mpi_rank, global_pins, global_dirty_pins, local_pins);
|
||||
"%d: pins: global / global dirty / local = %ld / %ld / %ld\n",
|
||||
world_mpi_rank, global_pins, global_dirty_pins, local_pins);
|
||||
HDfflush(stdout);
|
||||
|
||||
return;
|
||||
@ -504,6 +495,7 @@ print_stats(void)
|
||||
} /* print_stats() */
|
||||
#endif /* NOT_USED */
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: reset_stats()
|
||||
@ -793,7 +785,7 @@ init_data(void)
|
||||
data[i].global_pinned = FALSE;
|
||||
data[i].local_pinned = FALSE;
|
||||
data[i].cleared = FALSE;
|
||||
data[i].flushed = FALSE;
|
||||
data[i].flushed = FALSE;
|
||||
data[i].reads = 0;
|
||||
data[i].writes = 0;
|
||||
data[i].index = i;
|
||||
@ -883,12 +875,7 @@ do_express_test(void)
|
||||
*
|
||||
* Programmer: JRM -- 5/10/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
do_sync(void)
|
||||
{
|
||||
@ -960,12 +947,7 @@ do_sync(void)
|
||||
*
|
||||
* Programmer: JRM -- 1/3/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static int
|
||||
get_max_nerrors(void)
|
||||
{
|
||||
@ -1105,7 +1087,6 @@ recv_mssg(struct mssg_t *mssg_ptr,
|
||||
* Added the add_req_to_tag parameter and supporting code.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
send_mssg(struct mssg_t *mssg_ptr,
|
||||
hbool_t add_req_to_tag)
|
||||
@ -1250,7 +1231,7 @@ setup_derived_types(void)
|
||||
|
||||
} /* setup_derived_types */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: takedown_derived_types()
|
||||
@ -1264,12 +1245,7 @@ setup_derived_types(void)
|
||||
*
|
||||
* Programmer: JRM -- 12/22/05
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
takedown_derived_types(void)
|
||||
{
|
||||
@ -1311,12 +1287,7 @@ takedown_derived_types(void)
|
||||
*
|
||||
* Programmer: JRM -- 5/5/10
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
reset_server_counters(void)
|
||||
{
|
||||
@ -1394,7 +1365,6 @@ reset_server_counters(void)
|
||||
* Updated for sync message.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
server_main(void)
|
||||
{
|
||||
@ -1593,11 +1563,11 @@ serve_read_request(struct mssg_t * mssg_ptr)
|
||||
success = FALSE;
|
||||
if ( verbose ) {
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: proc %d read invalid entry. idx/base_addr = %d/0x%llx.\n",
|
||||
world_mpi_rank, fcn_name,
|
||||
mssg_ptr->src,
|
||||
"%d:%s: proc %d read invalid entry. idx/base_addr = %d/%a.\n",
|
||||
world_mpi_rank, fcn_name,
|
||||
mssg_ptr->src,
|
||||
target_index,
|
||||
(long long)(data[target_index].base_addr));
|
||||
data[target_index].base_addr);
|
||||
}
|
||||
} else {
|
||||
|
||||
@ -1648,7 +1618,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
|
||||
|
||||
} /* serve_read_request() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: serve_sync_request()
|
||||
@ -1669,12 +1639,7 @@ serve_read_request(struct mssg_t * mssg_ptr)
|
||||
*
|
||||
* Programmer: JRM -- 5/10/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
serve_sync_request(struct mssg_t * mssg_ptr)
|
||||
{
|
||||
@ -2678,58 +2643,66 @@ load_datum(H5F_t UNUSED *f,
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
#if 0 /* This has been useful debugging code -- keep it for now. */
|
||||
if ( mssg.req != READ_REQ_REPLY_CODE ) {
|
||||
if ( mssg.req != READ_REQ_REPLY_CODE ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.req != READ_REQ_REPLY_CODE.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.req = %d.\n",
|
||||
world_mpi_rank, fcn_name, (int)(mssg.req));
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.req != READ_REQ_REPLY_CODE.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.req = %d.\n",
|
||||
world_mpi_rank, fcn_name, (int)(mssg.req));
|
||||
}
|
||||
|
||||
if ( mssg.src != world_server_mpi_rank ) {
|
||||
if ( mssg.src != world_server_mpi_rank ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.src != world_server_mpi_rank.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.src != world_server_mpi_rank.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
|
||||
if ( mssg.dest != world_mpi_rank ) {
|
||||
if ( mssg.dest != world_mpi_rank ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.dest != world_mpi_rank.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.dest != world_mpi_rank.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
|
||||
if ( mssg.base_addr != entry_ptr->base_addr ) {
|
||||
if ( mssg.base_addr != entry_ptr->base_addr ) {
|
||||
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.base_addr != entry_ptr->base_addr.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.base_addr = %a.\n",
|
||||
world_mpi_rank, fcn_name, mssg.base_addr);
|
||||
HDfprintf(stdout, "%d:%s: entry_ptr->base_addr = %a.\n",
|
||||
world_mpi_rank, fcn_name, entry_ptr->base_addr);
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.base_addr != entry_ptr->base_addr.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.base_addr = %a.\n",
|
||||
world_mpi_rank, fcn_name, mssg.base_addr);
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: entry_ptr->base_addr = %a.\n",
|
||||
world_mpi_rank, fcn_name,
|
||||
entry_ptr->base_addr);
|
||||
}
|
||||
|
||||
if ( mssg.len != entry_ptr->len ) {
|
||||
if ( mssg.len != entry_ptr->len ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.len != entry_ptr->len.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.len = %a.\n",
|
||||
world_mpi_rank, fcn_name, mssg.len);
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.len != entry_ptr->len.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
HDfprintf(stdout, "%d:%s: mssg.len = %a.\n",
|
||||
world_mpi_rank, fcn_name, mssg.len);
|
||||
}
|
||||
|
||||
if ( mssg.ver < entry_ptr->ver ) {
|
||||
if ( mssg.ver < entry_ptr->ver ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.ver < entry_ptr->ver.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
HDfprintf(stdout,
|
||||
"%d:%s: mssg.ver < entry_ptr->ver.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
|
||||
if ( mssg.magic != MSSG_MAGIC ) {
|
||||
if ( mssg.magic != MSSG_MAGIC ) {
|
||||
|
||||
HDfprintf(stdout, "%d:%s: mssg.magic != MSSG_MAGIC.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
HDfprintf(stdout, "%d:%s: mssg.magic != MSSG_MAGIC.\n",
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
#endif /* JRM */
|
||||
} else {
|
||||
|
||||
} else {
|
||||
|
||||
entry_ptr->ver = mssg.ver;
|
||||
entry_ptr->header.is_dirty = FALSE;
|
||||
@ -2803,7 +2776,7 @@ size_datum(H5F_t UNUSED * f,
|
||||
|
||||
} /* size_datum() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************** test utility functions ***************************/
|
||||
/*****************************************************************************/
|
||||
@ -2821,12 +2794,7 @@ size_datum(H5F_t UNUSED * f,
|
||||
* Programmer: John Mainzer
|
||||
* 07/11/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
expunge_entry(H5F_t * file_ptr,
|
||||
int32_t idx)
|
||||
@ -2887,7 +2855,7 @@ expunge_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* expunge_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: insert_entry()
|
||||
*
|
||||
@ -2909,7 +2877,6 @@ expunge_entry(H5F_t * file_ptr,
|
||||
* any pins must be global pins.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
insert_entry(H5C_t * cache_ptr,
|
||||
H5F_t * file_ptr,
|
||||
@ -2998,7 +2965,7 @@ insert_entry(H5C_t * cache_ptr,
|
||||
|
||||
} /* insert_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: local_pin_and_unpin_random_entries()
|
||||
*
|
||||
@ -3012,10 +2979,7 @@ insert_entry(H5C_t * cache_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 4/12/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
local_pin_and_unpin_random_entries(H5F_t * file_ptr,
|
||||
int min_idx,
|
||||
@ -3118,7 +3082,7 @@ local_pin_random_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* local_pin_random_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: local_unpin_all_entries()
|
||||
*
|
||||
@ -3131,10 +3095,7 @@ local_pin_random_entry(H5F_t * file_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 4/12/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
local_unpin_all_entries(H5F_t * file_ptr,
|
||||
hbool_t via_unprotect)
|
||||
@ -3160,7 +3121,7 @@ local_unpin_all_entries(H5F_t * file_ptr,
|
||||
|
||||
} /* local_unpin_all_entries() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: local_unpin_next_pinned_entry()
|
||||
*
|
||||
@ -3176,10 +3137,7 @@ local_unpin_all_entries(H5F_t * file_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 4/12/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static int
|
||||
local_unpin_next_pinned_entry(H5F_t * file_ptr,
|
||||
int start_idx,
|
||||
@ -3222,7 +3180,7 @@ local_unpin_next_pinned_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* local_unpin_next_pinned_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: lock_and_unlock_random_entries()
|
||||
*
|
||||
@ -3237,10 +3195,7 @@ local_unpin_next_pinned_entry(H5F_t * file_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 1/12/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
lock_and_unlock_random_entries(H5F_t * file_ptr,
|
||||
int min_idx,
|
||||
@ -3273,7 +3228,7 @@ lock_and_unlock_random_entries(H5F_t * file_ptr,
|
||||
|
||||
} /* lock_and_unlock_random_entries() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: lock_and_unlock_random_entry()
|
||||
*
|
||||
@ -3287,10 +3242,7 @@ lock_and_unlock_random_entries(H5F_t * file_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 1/4/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
lock_and_unlock_random_entry(H5F_t * file_ptr,
|
||||
int min_idx,
|
||||
@ -3320,7 +3272,7 @@ lock_and_unlock_random_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* lock_and_unlock_random_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: lock_entry()
|
||||
*
|
||||
@ -3340,7 +3292,6 @@ lock_and_unlock_random_entry(H5F_t * file_ptr,
|
||||
* datum.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
lock_entry(H5F_t * file_ptr,
|
||||
int32_t idx)
|
||||
@ -3400,7 +3351,6 @@ lock_entry(H5F_t * file_ptr,
|
||||
* 4/14/06
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
mark_entry_dirty(int32_t idx)
|
||||
{
|
||||
@ -3442,7 +3392,7 @@ mark_entry_dirty(int32_t idx)
|
||||
|
||||
} /* mark_entry_dirty() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: pin_entry()
|
||||
*
|
||||
@ -3455,10 +3405,7 @@ mark_entry_dirty(int32_t idx)
|
||||
* Programmer: John Mainzer
|
||||
* 4/11/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
pin_entry(H5F_t * file_ptr,
|
||||
int32_t idx,
|
||||
@ -3512,8 +3459,8 @@ pin_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* pin_entry() */
|
||||
|
||||
|
||||
#ifdef H5_METADATA_TRACE_FILE
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: pin_protected_entry()
|
||||
*
|
||||
@ -3527,12 +3474,7 @@ pin_entry(H5F_t * file_ptr,
|
||||
* Programmer: John Mainzer
|
||||
* 01/04/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
pin_protected_entry(int32_t idx,
|
||||
hbool_t global)
|
||||
@ -3793,7 +3735,7 @@ reset_server_counts(void)
|
||||
|
||||
} /* reset_server_counts() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: resize_entry()
|
||||
*
|
||||
@ -3808,12 +3750,7 @@ reset_server_counts(void)
|
||||
* Programmer: John Mainzer
|
||||
* 7/11/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
resize_entry(int32_t idx,
|
||||
size_t new_size)
|
||||
@ -4070,8 +4007,7 @@ setup_cache_for_test(hid_t * fid_ptr,
|
||||
|
||||
if ( success ) {
|
||||
|
||||
if ( H5AC_set_sync_point_done_callback(cache_ptr, verify_writes) !=
|
||||
SUCCEED ) {
|
||||
if ( H5AC_set_sync_point_done_callback(cache_ptr, verify_writes) != SUCCEED ) {
|
||||
|
||||
nerrors++;
|
||||
if ( verbose ) {
|
||||
@ -4215,7 +4151,7 @@ verify_writes(int num_writes,
|
||||
|
||||
} /* verify_writes() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: setup_rand()
|
||||
@ -4235,7 +4171,6 @@ verify_writes(int num_writes,
|
||||
* Modified function to facilitate setting predefined seeds.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
setup_rand(void)
|
||||
{
|
||||
@ -4282,7 +4217,7 @@ setup_rand(void)
|
||||
|
||||
} /* setup_rand() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: take_down_cache()
|
||||
@ -4298,12 +4233,7 @@ setup_rand(void)
|
||||
*
|
||||
* Programmer: JRM -- 1/4/06
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static hbool_t
|
||||
take_down_cache(hid_t fid)
|
||||
{
|
||||
@ -4760,7 +4690,7 @@ verify_total_writes(int expected_total_writes)
|
||||
|
||||
} /* verify_total_writes() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: unlock_entry()
|
||||
*
|
||||
@ -4779,7 +4709,6 @@ verify_total_writes(int expected_total_writes)
|
||||
* Updated for the new local_len field in datum.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
void
|
||||
unlock_entry(H5F_t * file_ptr,
|
||||
int32_t idx,
|
||||
@ -4847,7 +4776,7 @@ unlock_entry(H5F_t * file_ptr,
|
||||
|
||||
} /* unlock_entry() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Function: unpin_entry()
|
||||
*
|
||||
@ -4866,7 +4795,6 @@ unlock_entry(H5F_t * file_ptr,
|
||||
* Added assertion that entry is pinned on entry.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
unpin_entry(H5F_t * file_ptr,
|
||||
int32_t idx,
|
||||
@ -5716,7 +5644,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
{
|
||||
const char * fcn_name = "smoke_check_3()";
|
||||
hbool_t success = TRUE;
|
||||
int cp = 0;
|
||||
int i;
|
||||
int max_nerrors;
|
||||
int min_count;
|
||||
@ -5749,18 +5676,12 @@ smoke_check_3(int metadata_write_strategy)
|
||||
break;
|
||||
}
|
||||
|
||||
/* 0 */
|
||||
if ( verbose ) { HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); }
|
||||
|
||||
nerrors = 0;
|
||||
init_data();
|
||||
reset_stats();
|
||||
|
||||
if ( world_mpi_rank == world_server_mpi_rank ) {
|
||||
|
||||
/* 1 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
if ( ! server_main() ) {
|
||||
|
||||
/* some error occured in the server -- report failure */
|
||||
@ -5770,15 +5691,9 @@ smoke_check_3(int metadata_write_strategy)
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
}
|
||||
|
||||
/* 2 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
}
|
||||
else /* run the clients */
|
||||
{
|
||||
/* 1 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
if ( ! setup_cache_for_test(&fid, &file_ptr, &cache_ptr,
|
||||
metadata_write_strategy) ) {
|
||||
|
||||
@ -5791,9 +5706,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 2 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
min_count = 100 / ((file_mpi_rank + 1) * (file_mpi_rank + 1));
|
||||
max_count = min_count + 50;
|
||||
|
||||
@ -5808,9 +5720,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 3 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
|
||||
min_count = 100 / ((file_mpi_rank + 2) * (file_mpi_rank + 2));
|
||||
max_count = min_count + 50;
|
||||
@ -5850,9 +5759,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
|
||||
}
|
||||
|
||||
/* 4 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
|
||||
/* flush the file to be sure that we have no problems flushing
|
||||
* pinned entries
|
||||
@ -5865,9 +5771,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 5 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
|
||||
min_idx = 0;
|
||||
max_idx = ((virt_num_data_entries / 10) /
|
||||
@ -5902,9 +5805,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 6 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
min_idx = 0;
|
||||
max_idx = ((virt_num_data_entries / 10) /
|
||||
((file_mpi_rank + 3) * (file_mpi_rank + 3))) - 1;
|
||||
@ -5921,9 +5821,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
min_idx, max_idx, 0, 100);
|
||||
}
|
||||
|
||||
/* 7 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
/* we can't move pinned entries, so release any local pins now. */
|
||||
local_unpin_all_entries(file_ptr, FALSE);
|
||||
|
||||
@ -5941,9 +5838,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
min_count, max_count);
|
||||
}
|
||||
|
||||
/* 8 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
/* ...and then move them back. */
|
||||
for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
|
||||
{
|
||||
@ -5955,9 +5849,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
min_count, max_count);
|
||||
}
|
||||
|
||||
/* 9 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
/* finally, do some dirty lock/unlocks while we give the cache
|
||||
* a chance t reduce its size.
|
||||
*/
|
||||
@ -5980,9 +5871,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 10 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
/* release any local pins before we take down the cache. */
|
||||
local_unpin_all_entries(file_ptr, FALSE);
|
||||
|
||||
@ -5998,9 +5886,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 11 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
|
||||
/* verify that all instances of datum are back where the started
|
||||
* and are clean.
|
||||
*/
|
||||
@ -6036,9 +5921,6 @@ smoke_check_3(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 12 */
|
||||
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
|
||||
}
|
||||
|
||||
max_nerrors = get_max_nerrors();
|
||||
@ -6400,7 +6282,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
{
|
||||
const char * fcn_name = "smoke_check_5()";
|
||||
hbool_t success = TRUE;
|
||||
int cp = 0;
|
||||
int i;
|
||||
int max_nerrors;
|
||||
hid_t fid = -1;
|
||||
@ -6430,20 +6311,12 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
|
||||
|
||||
/* 0 */
|
||||
if ( verbose ) { HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++); }
|
||||
|
||||
nerrors = 0;
|
||||
init_data();
|
||||
reset_stats();
|
||||
|
||||
if ( world_mpi_rank == world_server_mpi_rank ) {
|
||||
|
||||
/* 1 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
if ( ! server_main() ) {
|
||||
|
||||
/* some error occured in the server -- report failure */
|
||||
@ -6453,20 +6326,10 @@ smoke_check_5(int metadata_write_strategy)
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
}
|
||||
|
||||
/* 2 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
}
|
||||
else /* run the clients */
|
||||
{
|
||||
|
||||
/* 1 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
if ( ! setup_cache_for_test(&fid, &file_ptr, &cache_ptr,
|
||||
metadata_write_strategy) ) {
|
||||
|
||||
@ -6479,21 +6342,11 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 2 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
for ( i = 0; i < (virt_num_data_entries / 2); i++ )
|
||||
{
|
||||
insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
|
||||
}
|
||||
|
||||
/* 3 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
/* flush the file so we can lock known clean entries. */
|
||||
if ( H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0 ) {
|
||||
nerrors++;
|
||||
@ -6503,11 +6356,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 4 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
for ( i = 0; i < (virt_num_data_entries / 4); i++ )
|
||||
{
|
||||
lock_entry(file_ptr, i);
|
||||
@ -6531,11 +6379,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 5 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
for ( i = (virt_num_data_entries / 2) - 1;
|
||||
i >= (virt_num_data_entries / 4);
|
||||
i-- )
|
||||
@ -6560,11 +6403,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
unpin_entry(file_ptr, i, TRUE, FALSE, FALSE);
|
||||
}
|
||||
|
||||
/* 6 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
if ( fid >= 0 ) {
|
||||
|
||||
if ( ! take_down_cache(fid) ) {
|
||||
@ -6577,11 +6415,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
|
||||
/* 7 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
/* verify that all instance of datum are back where the started
|
||||
* and are clean.
|
||||
*/
|
||||
@ -6592,11 +6425,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
HDassert( ! (data[i].dirty) );
|
||||
}
|
||||
|
||||
/* 8 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
|
||||
/* compose the done message */
|
||||
mssg.req = DONE_REQ_CODE;
|
||||
mssg.src = world_mpi_rank;
|
||||
@ -6621,11 +6449,6 @@ smoke_check_5(int metadata_write_strategy)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 9 */
|
||||
if ( verbose ) {
|
||||
HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);
|
||||
}
|
||||
}
|
||||
|
||||
max_nerrors = get_max_nerrors();
|
||||
@ -7079,7 +6902,7 @@ trace_file_check(int metadata_write_strategy)
|
||||
|
||||
} /* trace_file_check() */
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function: main()
|
||||
@ -7092,12 +6915,7 @@ trace_file_check(int metadata_write_strategy)
|
||||
*
|
||||
* Programmer: JRM -- 12/23/05
|
||||
*
|
||||
* Modifications:
|
||||
*
|
||||
* None.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
@ -7123,7 +6941,8 @@ main(int argc, char **argv)
|
||||
* calls. By then, MPI calls may not work.
|
||||
*/
|
||||
if (H5dont_atexit() < 0){
|
||||
printf("Failed to turn off atexit processing. Continue.\n");
|
||||
printf("%d:Failed to turn off atexit processing. Continue.\n",
|
||||
mpi_rank);
|
||||
};
|
||||
H5open();
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user