mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-21 01:04:10 +08:00
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '5f7822fac4673cdb9e8ed60d104566c9df43303f': Express test mods to test/cache.c
This commit is contained in:
Allen Byrne
commit
afcede5368
@ -564,6 +564,7 @@ H5PLremove(unsigned int index)
|
||||
unsigned int plindex;
|
||||
|
||||
FUNC_ENTER_API(FAIL)
|
||||
H5TRACE1("e", "Iu", index);
|
||||
if(H5PL_num_paths_g == 0)
|
||||
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
|
||||
if(index >= H5PL_MAX_PATH_NUM)
|
||||
@ -608,6 +609,7 @@ H5PLget(unsigned int index, char *pathname/*out*/, size_t size)
|
||||
char *dl_path = NULL;
|
||||
|
||||
FUNC_ENTER_API(FAIL)
|
||||
H5TRACE3("Zs", "Iuxz", index, pathname, size);
|
||||
if(H5PL_num_paths_g == 0)
|
||||
HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
|
||||
if(index >= H5PL_MAX_PATH_NUM)
|
||||
|
||||
106
test/cache.c
106
test/cache.c
@ -241,10 +241,16 @@ smoke_check_1(int express_test, unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #1 -- all clean, ins, dest, ren, 4/2 MB cache, paged aggregation")
|
||||
TESTING("smoke check #1P -- all clean, ins, dest, ren, 4/2 MB cache")
|
||||
else
|
||||
TESTING("smoke check #1 -- all clean, ins, dest, ren, 4/2 MB cache")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -442,10 +448,16 @@ smoke_check_2(int express_test, unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #2 -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache, paged aggregation")
|
||||
TESTING("smoke check #2P -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache")
|
||||
else
|
||||
TESTING("smoke check #2 -- ~1/2 dirty, ins, dest, ren, 4/2 MB cache")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -642,10 +654,16 @@ smoke_check_3(int express_test, unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #3 -- all clean, ins, dest, ren, 2/1 KB cache, paged aggregation")
|
||||
TESTING("smoke check #3P -- all clean, ins, dest, ren, 2/1 KB cache")
|
||||
else
|
||||
TESTING("smoke check #3 -- all clean, ins, dest, ren, 2/1 KB cache")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -843,10 +861,16 @@ smoke_check_4(int express_test, unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #4 -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache, paged aggregation")
|
||||
TESTING("smoke check #4P -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache")
|
||||
else
|
||||
TESTING("smoke check #4 -- ~1/2 dirty, ins, dest, ren, 2/1 KB cache")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -1092,10 +1116,16 @@ smoke_check_5(int express_test, unsigned paged)
|
||||
};
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #5 -- all clean, ins, prot, unprot, AR cache 1, paged aggregation")
|
||||
TESTING("smoke check #5P -- all clean, ins, prot, unprot, AR cache 1")
|
||||
else
|
||||
TESTING("smoke check #5 -- all clean, ins, prot, unprot, AR cache 1")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -1330,10 +1360,16 @@ smoke_check_6(int express_test, unsigned paged)
|
||||
};
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #6 -- ~1/2 dirty, ins, prot, unprot, AR cache 1, paged aggregation")
|
||||
TESTING("smoke check #6P -- ~1/2 dirty, ins, prot, unprot, AR cache 1")
|
||||
else
|
||||
TESTING("smoke check #6 -- ~1/2 dirty, ins, prot, unprot, AR cache 1")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
pass = TRUE;
|
||||
|
||||
switch (express_test)
|
||||
@ -1569,10 +1605,16 @@ smoke_check_7(int express_test, unsigned paged)
|
||||
};
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #7 -- all clean, ins, prot, unprot, AR cache 2, paged aggregation")
|
||||
TESTING("smoke check #7P -- all clean, ins, prot, unprot, AR cache 2")
|
||||
else
|
||||
TESTING("smoke check #7 -- all clean, ins, prot, unprot, AR cache 2")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -1808,10 +1850,16 @@ smoke_check_8(int express_test, unsigned paged)
|
||||
};
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #8 -- ~1/2 dirty, ins, prot, unprot, AR cache 2, paged aggregation")
|
||||
TESTING("smoke check #8P -- ~1/2 dirty, ins, prot, unprot, AR cache 2")
|
||||
else
|
||||
TESTING("smoke check #8 -- ~1/2 dirty, ins, prot, unprot, AR cache 2")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -2008,10 +2056,16 @@ smoke_check_9(int express_test, unsigned paged)
|
||||
H5C_t * cache_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #9 -- all clean, ins, dest, ren, 4/2 MB, corked, paged aggregation")
|
||||
TESTING("smoke check #9P -- all clean, ins, dest, ren, 4/2 MB, corked")
|
||||
else
|
||||
TESTING("smoke check #9 -- all clean, ins, dest, ren, 4/2 MB, corked")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -2330,10 +2384,16 @@ smoke_check_10(int express_test, unsigned paged)
|
||||
H5C_t * cache_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("smoke check #10 -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked, paged aggregation")
|
||||
TESTING("smoke check #10P -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked")
|
||||
else
|
||||
TESTING("smoke check #10 -- ~1/2 dirty, ins, dest, ren, 4/2 MB, corked")
|
||||
|
||||
if ( paged && ( express_test > 0 ) ) {
|
||||
|
||||
SKIPPED();
|
||||
return(0);
|
||||
}
|
||||
|
||||
switch (express_test)
|
||||
{
|
||||
case 0:
|
||||
@ -2646,7 +2706,7 @@ express_test, unsigned paged)
|
||||
#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
|
||||
|
||||
if(paged)
|
||||
TESTING("write permitted check -- 1/0 MB cache, paged aggregation")
|
||||
TESTING("write permitted check -- 1/0 MB cache (paged aggregation)")
|
||||
else
|
||||
TESTING("write permitted check -- 1/0 MB cache")
|
||||
|
||||
@ -13329,7 +13389,7 @@ check_multiple_read_protect(unsigned paged)
|
||||
test_entry_t * entry_ptr;
|
||||
|
||||
if(paged)
|
||||
TESTING("multiple read only protects on a single entry (paged aggregation)")
|
||||
TESTING("multiple read only protects on a single entry (paged aggr)")
|
||||
else
|
||||
TESTING("multiple read only protects on a single entry")
|
||||
|
||||
@ -15954,7 +16014,7 @@ check_destroy_pinned_err(unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("destroy cache with permanently pinned entry error (paged aggregation)")
|
||||
TESTING("destroy cache with permanently pinned entry error (pgd aggr)")
|
||||
else
|
||||
TESTING("destroy cache with permanently pinned entry error")
|
||||
|
||||
@ -24438,7 +24498,7 @@ check_auto_cache_resize_epoch_markers(unsigned paged)
|
||||
};
|
||||
|
||||
if(paged)
|
||||
TESTING("automatic cache resize epoch marker management (paged aggregation)")
|
||||
TESTING("automatic cache resize epoch marker management (paged aggr)")
|
||||
else
|
||||
TESTING("automatic cache resize epoch marker management")
|
||||
|
||||
@ -28230,13 +28290,13 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged)
|
||||
|
||||
if(fill_via_insertion) {
|
||||
if(paged)
|
||||
TESTING("to ensure metadata blizzard absence when inserting (paged aggregation)")
|
||||
TESTING("to ensure metadata blizzard absence when inserting (pgd aggr)")
|
||||
else
|
||||
TESTING("to ensure metadata blizzard absence when inserting")
|
||||
} /* end if */
|
||||
else {
|
||||
if(paged)
|
||||
TESTING("to ensure metadata blizzard absence on protect/unprotect (paged aggregation)")
|
||||
TESTING("to ensure metadata blizzard absence on protect/unprotect (pa)")
|
||||
else
|
||||
TESTING("to ensure metadata blizzard absence on protect/unprotect")
|
||||
} /* end else */
|
||||
@ -34383,7 +34443,7 @@ check_entry_deletions_during_scans(unsigned paged)
|
||||
H5F_t * file_ptr = NULL;
|
||||
|
||||
if(paged)
|
||||
TESTING("entry deletion during list scan detection and adaption (paged aggregation)")
|
||||
TESTING("entry deletion during list scan detection and adaption (par)")
|
||||
else
|
||||
TESTING("entry deletion during list scan detection and adaption")
|
||||
|
||||
@ -36394,6 +36454,18 @@ main(void)
|
||||
/* Test with paged aggregation enabled or not */
|
||||
/* Each test will call setup_cache() which set up the file space strategy according to "paged" */
|
||||
for(paged = FALSE; paged <= TRUE; paged++) {
|
||||
|
||||
if ( paged ) {
|
||||
|
||||
HDfprintf(stdout,
|
||||
"\n\nRe-running tests with paged aggregation:\n");
|
||||
|
||||
if ( express_test > 0 )
|
||||
HDfprintf(stdout, " Skipping smoke checks.\n");
|
||||
|
||||
HDfprintf(stdout, "\n");
|
||||
}
|
||||
|
||||
nerrs += smoke_check_1(express_test, paged);
|
||||
nerrs += smoke_check_2(express_test, paged);
|
||||
nerrs += smoke_check_3(express_test, paged);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user