summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/cache.c13
-rw-r--r--test/cache_common.c31
-rw-r--r--test/cache_common.h2
-rw-r--r--test/vfd_swmr.c2
-rw-r--r--test/vfd_swmr_generator.c2
5 files changed, 32 insertions, 18 deletions
diff --git a/test/cache.c b/test/cache.c
index d5e3c6c..3883ac3 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -13976,7 +13976,7 @@ check_move_entry__run_test(H5F_t * file_ptr,
if(!spec_ptr->is_protected)
unprotect_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, flags);
- move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE);
+ move_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE);
}
@@ -14074,7 +14074,7 @@ check_move_entry__run_test(H5F_t * file_ptr,
}
/* put the entry back where it started from */
- move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE);
+ move_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE);
return;
@@ -16960,7 +16960,8 @@ check_move_entry_errs(unsigned paged)
} /* end if */
if(pass) {
- result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_0_1_ptr->addr);
+ result = H5C_move_entry(file_ptr, types[0], entry_0_0_ptr->addr,
+ entry_0_1_ptr->addr);
if(result >= 0) {
pass = FALSE;
@@ -16969,7 +16970,8 @@ check_move_entry_errs(unsigned paged)
} /* end if */
if(pass) {
- result = H5C_move_entry(cache_ptr, types[0], entry_0_0_ptr->addr, entry_1_0_ptr->addr);
+ result = H5C_move_entry(file_ptr, types[0], entry_0_0_ptr->addr,
+ entry_1_0_ptr->addr);
if(result >= 0) {
pass = FALSE;
@@ -17000,7 +17002,8 @@ check_move_entry_errs(unsigned paged)
} /* end if */
if(pass) {
- result = H5C_move_entry(cache_ptr, types[0], entry_ptr->header.addr, entry_ptr->header.addr + 10);
+ result = H5C_move_entry(file_ptr, types[0], entry_ptr->header.addr,
+ entry_ptr->header.addr + 10);
if(result >= 0) {
pass = FALSE;
diff --git a/test/cache_common.c b/test/cache_common.c
index b078964..3041dfd 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -308,6 +308,7 @@ static const H5C_class_t pico_class[1] = {{
NULL,
pico_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t nano_class[1] = {{
@@ -325,6 +326,7 @@ static const H5C_class_t nano_class[1] = {{
NULL,
nano_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t micro_class[1] = {{
@@ -342,6 +344,7 @@ static const H5C_class_t micro_class[1] = {{
NULL,
micro_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t tiny_class[1] = {{
@@ -359,6 +362,7 @@ static const H5C_class_t tiny_class[1] = {{
NULL,
tiny_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t small_class[1] = {{
@@ -376,6 +380,7 @@ static const H5C_class_t small_class[1] = {{
NULL,
small_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t medium_class[1] = {{
@@ -393,6 +398,7 @@ static const H5C_class_t medium_class[1] = {{
NULL,
medium_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t large_class[1] = {{
@@ -410,6 +416,7 @@ static const H5C_class_t large_class[1] = {{
NULL,
large_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t huge_class[1] = {{
@@ -427,6 +434,7 @@ static const H5C_class_t huge_class[1] = {{
NULL,
huge_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t monster_class[1] = {{
@@ -444,6 +452,7 @@ static const H5C_class_t monster_class[1] = {{
NULL,
monster_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t variable_class[1] = {{
@@ -461,6 +470,7 @@ static const H5C_class_t variable_class[1] = {{
NULL,
variable_free_icr,
NULL,
+ NULL,
}};
static const H5C_class_t notify_class[1] = {{
@@ -478,6 +488,7 @@ static const H5C_class_t notify_class[1] = {{
notify_notify,
notify_free_icr,
NULL,
+ NULL,
}};
/* callback table declaration */
@@ -2088,7 +2099,7 @@ execute_flush_op(H5F_t * file_ptr,
} /* end else */
} /* end if */
else
- move_entry(cache_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
+ move_entry(file_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag);
break;
case FLUSH_OP__ORDER:
@@ -3928,10 +3939,10 @@ mark_entry_dirty(int32_t type,
*/
void
-move_entry(H5C_t * cache_ptr,
- int32_t type,
- int32_t idx,
- hbool_t main_addr)
+move_entry(H5F_t * file_ptr,
+ int32_t type,
+ int32_t idx,
+ hbool_t main_addr)
{
herr_t result;
hbool_t done = TRUE; /* will set to FALSE if we have work to do */
@@ -3942,7 +3953,7 @@ move_entry(H5C_t * cache_ptr,
if ( pass ) {
- HDassert( cache_ptr );
+ HDassert( file_ptr );
HDassert( ( 0 <= type ) && ( type < NUMBER_OF_ENTRY_TYPES ) );
HDassert( ( 0 <= idx ) && ( idx <= max_indices[type] ) );
@@ -3952,7 +3963,7 @@ move_entry(H5C_t * cache_ptr,
HDassert( entry_ptr->index == idx );
HDassert( entry_ptr->type == type );
HDassert( entry_ptr == entry_ptr->self );
- HDassert( entry_ptr->cache_ptr == cache_ptr );
+ HDassert( entry_ptr->cache_ptr == file_ptr->shared->cache );
HDassert( !entry_ptr->is_read_only );
HDassert( !entry_ptr->header.is_read_only );
@@ -3987,7 +3998,7 @@ move_entry(H5C_t * cache_ptr,
mark_flush_dep_dirty(entry_ptr);
entry_ptr->action = TEST_ENTRY_ACTION_MOVE;
- result = H5C_move_entry(cache_ptr, types[type], old_addr, new_addr);
+ result = H5C_move_entry(file_ptr, types[type], old_addr, new_addr);
entry_ptr->action = TEST_ENTRY_ACTION_NUL;
}
@@ -4544,7 +4555,7 @@ row_major_scan_forward(H5F_t * file_ptr,
if(verbose)
HDfprintf(stdout, "4(r, %d, %d, %d) ", type, tmp_idx, (int)move_to_main_addr);
- move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
+ move_entry(file_ptr, type, tmp_idx, move_to_main_addr);
HDassert(cache_ptr->slist_size == cache_ptr->dirty_index_size);
} /* end if */
@@ -4964,7 +4975,7 @@ row_major_scan_backward(H5F_t * file_ptr,
HDfprintf(stdout, "(r, %d, %d, %d) ",
type, tmp_idx, (int)move_to_main_addr);
- move_entry(cache_ptr, type, tmp_idx, move_to_main_addr);
+ move_entry(file_ptr, type, tmp_idx, move_to_main_addr);
}
tmp_idx++;
diff --git a/test/cache_common.h b/test/cache_common.h
index 9c66357..ffef413 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -599,7 +599,7 @@ H5TEST_DLL void insert_entry(H5F_t * file_ptr,
H5TEST_DLL void mark_entry_dirty(int32_t type,
int32_t idx);
-H5TEST_DLL void move_entry(H5C_t * cache_ptr,
+H5TEST_DLL void move_entry(H5F_t * file_ptr,
int32_t type,
int32_t idx,
hbool_t main_addr);
diff --git a/test/vfd_swmr.c b/test/vfd_swmr.c
index ccdc027..2427eb1 100644
--- a/test/vfd_swmr.c
+++ b/test/vfd_swmr.c
@@ -793,7 +793,7 @@ test_writer_md(void)
my_config->tick_len = 1;
my_config->max_lag = 3;
my_config->vfd_swmr_writer = TRUE;
- my_config->md_pages_reserved = 2;
+ my_config->md_pages_reserved = 256;
HDstrcpy(my_config->md_file_path, MD_FILENAME);
/* Set the VFD SWMR configuration in fapl */
diff --git a/test/vfd_swmr_generator.c b/test/vfd_swmr_generator.c
index f569935..cfdcdf7 100644
--- a/test/vfd_swmr_generator.c
+++ b/test/vfd_swmr_generator.c
@@ -179,7 +179,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t vfd_swmr_write,
config->tick_len = 4;
config->max_lag = 6;
config->vfd_swmr_writer = TRUE;
- config->md_pages_reserved = 200;
+ config->md_pages_reserved = 512;
HDstrcpy(config->md_file_path, "my_md_file");
/* Enable VFD SWMR configuration in fapl */
generated by cgit v0.12 at 2024-11-02 11:14:59 (GMT)