summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt6
-rw-r--r--test/CMakeTests.cmake47
-rw-r--r--test/app_ref.c2
-rw-r--r--test/cache.c1902
-rw-r--r--test/cache_api.c333
-rw-r--r--test/cache_common.c257
-rw-r--r--test/cache_common.h46
-rw-r--r--test/cache_tagging.c61
-rw-r--r--test/cmpd_dset.c20
-rw-r--r--test/cross_read.c2
-rw-r--r--test/dsets.c62
-rw-r--r--test/dt_arith.c6
-rw-r--r--test/dtypes.c12
-rw-r--r--test/earray.c23
-rw-r--r--test/error_test.c2
-rw-r--r--test/farray.c14
-rw-r--r--test/fheap.c14
-rw-r--r--test/fillval.c2
-rw-r--r--test/filter_fail.c4
-rw-r--r--test/freespace.c8
-rw-r--r--test/gen_filters.c6
-rw-r--r--test/h5test.c164
-rw-r--r--test/h5test.h18
-rw-r--r--test/hyperslab.c2
-rw-r--r--test/links.c68
-rw-r--r--test/objcopy.c2
-rw-r--r--test/tarray.c18
-rw-r--r--test/tattr.c16
-rw-r--r--test/tcheck_version.c4
-rw-r--r--test/tgenprop.c16
-rw-r--r--test/th5o.c4
-rw-r--r--test/th5s.c2
-rw-r--r--test/tid.c2
-rw-r--r--test/titerate.c6
-rw-r--r--test/tmisc.c20
-rw-r--r--test/trefer.c2
-rw-r--r--test/tselect.c12
-rw-r--r--test/tskiplist.c4
-rw-r--r--test/ttsafe_cancel.c6
-rw-r--r--test/ttsafe_error.c6
-rw-r--r--test/tunicode.c6
-rw-r--r--test/tvltypes.c14
-rw-r--r--test/unregister.c6
43 files changed, 1141 insertions, 2086 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 55b3c44..651e4eb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -85,7 +85,7 @@ if (BUILD_SHARED_LIBS)
TARGET ${HDF5_TEST_PLUGIN_LIB_TARGET}
POST_BUILD
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different
+ ARGS -E copy_if_different
"$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
"${CMAKE_BINARY_DIR}/testdir1/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
)
@@ -116,7 +116,7 @@ if (BUILD_SHARED_LIBS)
TARGET ${HDF5_TEST_PLUGIN_LIB_TARGET}
POST_BUILD
COMMAND ${CMAKE_COMMAND}
- ARGS -E copy_if_different
+ ARGS -E copy_if_different
"$<TARGET_FILE:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
"${CMAKE_BINARY_DIR}/testdir2/$<TARGET_FILE_NAME:${HDF5_TEST_PLUGIN_LIB_TARGET}>"
)
@@ -293,7 +293,7 @@ set_target_properties (links_env PROPERTIES FOLDER test)
#-- Adding test for libinfo
set (GREP_RUNNER ${PROJECT_BINARY_DIR}/GrepRunner.cmake)
-file (WRITE ${GREP_RUNNER}
+file (WRITE ${GREP_RUNNER}
"file (STRINGS \${TEST_PROGRAM} TEST_RESULT REGEX \"SUMMARY OF THE HDF5 CONFIGURATION\")
if (\${TEST_RESULT} STREQUAL \"0\")
message (FATAL_ERROR \"Failed: The output: \${TEST_RESULT} of \${TEST_PROGRAM} did not contain SUMMARY OF THE HDF5 CONFIGURATION\")
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 92e4574..c7803f6 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -204,7 +204,7 @@ endif (HDF5_TEST_VFD)
add_test (
NAME H5TEST-clear-testhdf5-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
coord.h5
dtypes10.h5
sys_file1
@@ -259,7 +259,7 @@ else (HDF5_ENABLE_USING_MEMCHECKER)
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
endif (HDF5_ENABLE_USING_MEMCHECKER)
-
+
##############################################################################
##############################################################################
### T H E T E S T S M A C R O S ###
@@ -270,7 +270,7 @@ endif (HDF5_ENABLE_USING_MEMCHECKER)
add_test (
NAME H5TEST-clear-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
dt_arith1.h5
dt_arith2.h5
dtransform.h5
@@ -335,9 +335,16 @@ add_test (
)
foreach (test ${H5_TESTS})
- add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>)
+ if (${test} STREQUAL "big" AND CYGWIN)
+ add_test (
+ NAME H5TEST-${test}
+ COMMAND ${CMAKE_COMMAND} -E echo "SKIP ${test}"
+ )
+ else (${test} STREQUAL "big" AND CYGWIN)
+ add_test (NAME H5TEST-${test} COMMAND $<TARGET_FILE:${test}>)
+ endif (${test} STREQUAL "big" AND CYGWIN)
set_tests_properties (H5TEST-${test} PROPERTIES
- DEPENDS H5TEST-clear-objects
+ DEPENDS H5TEST-clear-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@@ -358,7 +365,7 @@ set_tests_properties (H5TEST-big PROPERTIES TIMEOUT 1800)
add_test (
NAME H5TEST-clear-cache-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
cache_test.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
@@ -374,14 +381,14 @@ set_tests_properties (H5TEST-cache PROPERTIES
add_test (
NAME H5TEST-clear-cache_api-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
cache_api_test.h5
WORKING_DIRECTORY
${HDF5_TEST_BINARY_DIR}/H5TEST
)
add_test (NAME H5TEST-cache_api COMMAND $<TARGET_FILE:cache_api>)
set_tests_properties (H5TEST-cache_api PROPERTIES
- DEPENDS H5TEST-clear-cache_api-objects
+ DEPENDS H5TEST-clear-cache_api-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
)
@@ -390,7 +397,7 @@ set_tests_properties (H5TEST-cache_api PROPERTIES
add_test (
NAME H5TEST-clear-cache_tagging-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
tagging_test.h5
tagging_ext_test.h5
WORKING_DIRECTORY
@@ -407,7 +414,7 @@ set_tests_properties (H5TEST-cache_tagging PROPERTIES
add_test (
NAME H5TEST-clear-ttsafe-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
ttsafe_error.h5
ttsafe_dcreate.h5
ttsafe_cancel.h5
@@ -427,7 +434,7 @@ if (HDF5_ENABLE_DEPRECATED_SYMBOLS)
add_test (
NAME H5TEST-clear-err_compat-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
err_compat.txt
err_compat.txt.err
WORKING_DIRECTORY
@@ -454,7 +461,7 @@ endif (HDF5_ENABLE_DEPRECATED_SYMBOLS)
add_test (
NAME H5TEST-clear-error_test-objects
COMMAND ${CMAKE_COMMAND}
- -E remove
+ -E remove
error_test.txt
error_test.txt.err
WORKING_DIRECTORY
@@ -470,7 +477,7 @@ add_test (NAME H5TEST-error_test COMMAND "${CMAKE_COMMAND}"
-D "TEST_FOLDER=${PROJECT_BINARY_DIR}/H5TEST"
-P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake"
)
-set_tests_properties (H5TEST-error_test PROPERTIES
+set_tests_properties (H5TEST-error_test PROPERTIES
DEPENDS H5TEST-clear-error_test-objects
ENVIRONMENT "srcdir=${HDF5_TEST_BINARY_DIR}/H5TEST;HDF5_PLUGIN_PRELOAD=::"
WORKING_DIRECTORY ${HDF5_TEST_BINARY_DIR}/H5TEST
@@ -482,7 +489,7 @@ add_test (
COMMAND ${CMAKE_COMMAND}
-E remove
links_env.txt
- links_env.txt.err
+ links_env.txt.err
extlinks_env0.h5
extlinks_env1.h5
tmp/extlinks_env1.h5
@@ -610,7 +617,7 @@ if (HDF5_TEST_VFD)
if (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
if (NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
add_test (
- NAME VFD-${vfdname}-${vfdtest}
+ NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
-D "TEST_ARGS:STRING="
@@ -632,7 +639,7 @@ if (HDF5_TEST_VFD)
endif(NOT BUILD_SHARED_LIBS AND NOT CMAKE_BUILD_TYPE MATCHES Debug)
else (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
add_test (
- NAME VFD-${vfdname}-${vfdtest}
+ NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
-D "TEST_ARGS:STRING="
@@ -649,7 +656,7 @@ if (HDF5_TEST_VFD)
endif (${vfdname} STREQUAL "multi" OR ${vfdname} STREQUAL "split")
else (${vfdtest} STREQUAL "flush1" OR ${vfdtest} STREQUAL "flush2")
add_test (
- NAME VFD-${vfdname}-${vfdtest}
+ NAME VFD-${vfdname}-${vfdtest}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${vfdtest}>"
-D "TEST_ARGS:STRING="
@@ -672,7 +679,7 @@ if (HDF5_TEST_VFD)
CHECK_VFD_TEST (${test} ${vfdname} ${resultcode})
else (WIN32)
add_test (
- NAME VFD-${vfdname}-${test}
+ NAME VFD-${vfdname}-${test}
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:${test}>"
-D "TEST_ARGS:STRING="
@@ -693,7 +700,7 @@ if (HDF5_TEST_VFD)
set_tests_properties (VFD-${vfdname}-flush2 PROPERTIES TIMEOUT 10)
if (HDF5_TEST_FHEAP_VFD)
add_test (
- NAME VFD-${vfdname}-fheap
+ NAME VFD-${vfdname}-fheap
COMMAND "${CMAKE_COMMAND}"
-D "TEST_PROGRAM=$<TARGET_FILE:fheap>"
-D "TEST_ARGS:STRING="
@@ -710,7 +717,7 @@ if (HDF5_TEST_VFD)
)
endif (HDF5_TEST_FHEAP_VFD)
ENDMACRO (ADD_VFD_TEST)
-
+
# Run test with different Virtual File Driver
foreach (vfd ${VFD_LIST})
ADD_VFD_TEST (${vfd} 0)
diff --git a/test/app_ref.c b/test/app_ref.c
index 611d255..3052df7 100644
--- a/test/app_ref.c
+++ b/test/app_ref.c
@@ -80,7 +80,7 @@ void Abrt_Handler (int sig);
/* Handler for SIGABRT - prints the reference count on each id */
void
-Abrt_Handler (int UNUSED sig)
+Abrt_Handler (int H5_ATTR_UNUSED sig)
{
int i, n;
diff --git a/test/cache.c b/test/cache.c
index 8725b31..85fbadb 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -235,7 +235,6 @@ static unsigned check_notify_cb(void);
static unsigned
smoke_check_1(void)
{
- const char * fcn_name = "smoke_check_1";
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
int dirty_destroys = FALSE;
@@ -256,22 +255,22 @@ smoke_check_1(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(4 * 1024 * 1024),
(size_t)(2 * 1024 * 1024));
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -287,9 +286,9 @@ smoke_check_1(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_backward(/* file_ptr */ file_ptr,
+ row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -305,9 +304,9 @@ smoke_check_1(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -323,7 +322,7 @@ smoke_check_1(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -334,9 +333,9 @@ smoke_check_1(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_forward(/* file_ptr */ file_ptr,
+ col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -347,7 +346,7 @@ smoke_check_1(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -358,9 +357,9 @@ smoke_check_1(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_backward(/* file_ptr */ file_ptr,
+ col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -371,13 +370,13 @@ smoke_check_1(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -387,7 +386,7 @@ smoke_check_1(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -420,7 +419,6 @@ smoke_check_1(void)
static unsigned
smoke_check_2(void)
{
- const char * fcn_name = "smoke_check_2";
hbool_t show_progress = FALSE;
int dirty_unprotects = TRUE;
int dirty_destroys = TRUE;
@@ -441,22 +439,22 @@ smoke_check_2(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(4 * 1024 * 1024),
(size_t)(2 * 1024 * 1024));
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -472,9 +470,9 @@ smoke_check_2(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_backward(/* file_ptr */ file_ptr,
+ row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -490,9 +488,9 @@ smoke_check_2(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -508,7 +506,7 @@ smoke_check_2(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -519,9 +517,9 @@ smoke_check_2(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_forward(/* file_ptr */ file_ptr,
+ col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -532,7 +530,7 @@ smoke_check_2(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -543,9 +541,9 @@ smoke_check_2(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_backward(/* file_ptr */ file_ptr,
+ col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -556,13 +554,13 @@ smoke_check_2(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -572,7 +570,7 @@ smoke_check_2(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -604,7 +602,6 @@ smoke_check_2(void)
static unsigned
smoke_check_3(void)
{
- const char * fcn_name = "smoke_check_3";
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
int dirty_destroys = FALSE;
@@ -625,22 +622,22 @@ smoke_check_3(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -656,7 +653,7 @@ smoke_check_3(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -674,7 +671,7 @@ smoke_check_3(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -692,7 +689,7 @@ smoke_check_3(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -703,7 +700,7 @@ smoke_check_3(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -716,7 +713,7 @@ smoke_check_3(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -727,7 +724,7 @@ smoke_check_3(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -740,13 +737,13 @@ smoke_check_3(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -756,7 +753,7 @@ smoke_check_3(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -789,7 +786,6 @@ smoke_check_3(void)
static unsigned
smoke_check_4(void)
{
- const char * fcn_name = "smoke_check_4";
hbool_t show_progress = FALSE;
int dirty_unprotects = TRUE;
int dirty_destroys = TRUE;
@@ -810,22 +806,22 @@ smoke_check_4(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -841,9 +837,9 @@ smoke_check_4(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_backward(/* file_ptr */ file_ptr,
+ row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -859,9 +855,9 @@ smoke_check_4(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- row_major_scan_forward(/* file_ptr */ file_ptr,
+ row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -877,7 +873,7 @@ smoke_check_4(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -888,9 +884,9 @@ smoke_check_4(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_forward(/* file_ptr */ file_ptr,
+ col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -901,7 +897,7 @@ smoke_check_4(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -912,9 +908,9 @@ smoke_check_4(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
- col_major_scan_backward(/* file_ptr */ file_ptr,
+ col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
/* verbose */ FALSE,
/* reset_stats */ TRUE,
@@ -925,13 +921,13 @@ smoke_check_4(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -941,7 +937,7 @@ smoke_check_4(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -974,7 +970,6 @@ smoke_check_4(void)
static unsigned
smoke_check_5(void)
{
- const char * fcn_name = "smoke_check_5";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
@@ -1052,13 +1047,13 @@ smoke_check_5(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
@@ -1077,7 +1072,7 @@ smoke_check_5(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1089,7 +1084,7 @@ smoke_check_5(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1101,7 +1096,7 @@ smoke_check_5(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1113,7 +1108,7 @@ smoke_check_5(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -1124,7 +1119,7 @@ smoke_check_5(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1137,7 +1132,7 @@ smoke_check_5(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -1148,7 +1143,7 @@ smoke_check_5(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1161,13 +1156,13 @@ smoke_check_5(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -1177,7 +1172,7 @@ smoke_check_5(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -1210,7 +1205,6 @@ smoke_check_5(void)
static unsigned
smoke_check_6(void)
{
- const char * fcn_name = "smoke_check_6";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
@@ -1285,13 +1279,13 @@ smoke_check_6(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
@@ -1310,7 +1304,7 @@ smoke_check_6(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1322,7 +1316,7 @@ smoke_check_6(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1334,7 +1328,7 @@ smoke_check_6(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1346,7 +1340,7 @@ smoke_check_6(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -1357,7 +1351,7 @@ smoke_check_6(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1370,7 +1364,7 @@ smoke_check_6(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -1381,7 +1375,7 @@ smoke_check_6(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1394,13 +1388,13 @@ smoke_check_6(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -1410,7 +1404,7 @@ smoke_check_6(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -1443,7 +1437,6 @@ smoke_check_6(void)
static unsigned
smoke_check_7(void)
{
- const char * fcn_name = "smoke_check_7";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
@@ -1519,13 +1512,13 @@ smoke_check_7(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024),
(size_t)(1 * 1024));
@@ -1544,7 +1537,7 @@ smoke_check_7(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1556,7 +1549,7 @@ smoke_check_7(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1568,7 +1561,7 @@ smoke_check_7(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1580,7 +1573,7 @@ smoke_check_7(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -1591,7 +1584,7 @@ smoke_check_7(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1604,7 +1597,7 @@ smoke_check_7(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -1615,7 +1608,7 @@ smoke_check_7(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1628,13 +1621,13 @@ smoke_check_7(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -1644,7 +1637,7 @@ smoke_check_7(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -1677,7 +1670,6 @@ smoke_check_7(void)
static unsigned
smoke_check_8(void)
{
- const char * fcn_name = "smoke_check_8";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
@@ -1753,13 +1745,13 @@ smoke_check_8(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024));
cache_ptr = file_ptr->shared->cache;
@@ -1777,7 +1769,7 @@ smoke_check_8(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1789,7 +1781,7 @@ smoke_check_8(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1801,7 +1793,7 @@ smoke_check_8(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_row_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1813,7 +1805,7 @@ smoke_check_8(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -1824,7 +1816,7 @@ smoke_check_8(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_forward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1837,7 +1829,7 @@ smoke_check_8(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -1848,7 +1840,7 @@ smoke_check_8(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
hl_col_major_scan_backward(/* file_ptr */ file_ptr,
/* max_index */ max_index,
@@ -1861,13 +1853,13 @@ smoke_check_8(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -1877,7 +1869,7 @@ smoke_check_8(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -1911,7 +1903,6 @@ smoke_check_8(void)
static unsigned
smoke_check_9(void)
{
- const char * fcn_name = "smoke_check_9";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = FALSE;
@@ -1935,13 +1926,13 @@ smoke_check_9(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(4 * 1024 * 1024),
(size_t)(2 * 1024 * 1024));
@@ -1951,7 +1942,7 @@ smoke_check_9(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -1966,7 +1957,7 @@ smoke_check_9(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -1986,7 +1977,7 @@ smoke_check_9(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2001,7 +1992,7 @@ smoke_check_9(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2019,7 +2010,7 @@ smoke_check_9(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2034,7 +2025,7 @@ smoke_check_9(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled \n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2052,7 +2043,7 @@ smoke_check_9(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2067,7 +2058,7 @@ smoke_check_9(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled \n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -2078,7 +2069,7 @@ smoke_check_9(void)
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2093,7 +2084,7 @@ smoke_check_9(void)
if ( show_progress ) /* 12 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2106,7 +2097,7 @@ smoke_check_9(void)
if ( show_progress ) /* 13 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -2117,7 +2108,7 @@ smoke_check_9(void)
if ( show_progress ) /* 14 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2132,7 +2123,7 @@ smoke_check_9(void)
if ( show_progress ) /* 15 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2145,7 +2136,7 @@ smoke_check_9(void)
if ( show_progress ) /* 16 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2161,13 +2152,13 @@ smoke_check_9(void)
if ( show_progress ) /* 17 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 18 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -2177,7 +2168,7 @@ smoke_check_9(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -2211,7 +2202,6 @@ smoke_check_9(void)
static unsigned
smoke_check_10(void)
{
- const char * fcn_name = "smoke_check_10";
herr_t result;
hbool_t show_progress = FALSE;
int dirty_unprotects = TRUE;
@@ -2235,13 +2225,13 @@ smoke_check_10(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(4 * 1024 * 1024),
(size_t)(2 * 1024 * 1024));
@@ -2249,7 +2239,7 @@ smoke_check_10(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2267,7 +2257,7 @@ smoke_check_10(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2282,7 +2272,7 @@ smoke_check_10(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2300,7 +2290,7 @@ smoke_check_10(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2315,7 +2305,7 @@ smoke_check_10(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2333,7 +2323,7 @@ smoke_check_10(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2348,7 +2338,7 @@ smoke_check_10(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -2359,7 +2349,7 @@ smoke_check_10(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2374,7 +2364,7 @@ smoke_check_10(void)
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2387,7 +2377,7 @@ smoke_check_10(void)
if ( show_progress ) /* 12 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2402,7 +2392,7 @@ smoke_check_10(void)
if ( show_progress ) /* 13 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush all entries in the cache: */
@@ -2413,7 +2403,7 @@ smoke_check_10(void)
if ( show_progress ) /* 14 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2428,7 +2418,7 @@ smoke_check_10(void)
if ( show_progress ) /* 15 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions enabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_backward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2441,7 +2431,7 @@ smoke_check_10(void)
if ( show_progress ) /* 16 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2456,13 +2446,13 @@ smoke_check_10(void)
if ( show_progress ) /* 17 */
HDfprintf(stdout, "%s() - %0d -- pass = %d -- evictions disabled\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 18 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -2472,7 +2462,7 @@ smoke_check_10(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -2498,14 +2488,12 @@ smoke_check_10(void)
*
*-------------------------------------------------------------------------
*/
-
static unsigned
write_permitted_check(void)
{
#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
- const char * fcn_name = "write_permitted_check";
hbool_t show_progress = FALSE;
hbool_t display_stats = FALSE;
int32_t lag = 10;
@@ -2522,20 +2510,20 @@ write_permitted_check(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
reset_entries();
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
file_ptr = setup_cache((size_t)(1 * 1024 * 1024),
(size_t)(0));
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
row_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2553,7 +2541,7 @@ write_permitted_check(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
write_permitted = FALSE;
@@ -2573,7 +2561,7 @@ write_permitted_check(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
write_permitted = TRUE;
@@ -2593,7 +2581,7 @@ write_permitted_check(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* flush and destroy all entries in the cache: */
@@ -2604,7 +2592,7 @@ write_permitted_check(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
col_major_scan_forward(/* file_ptr */ file_ptr,
/* lag */ lag,
@@ -2617,7 +2605,7 @@ write_permitted_check(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
write_permitted = FALSE;
@@ -2634,13 +2622,13 @@ write_permitted_check(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
takedown_cache(file_ptr, display_stats, TRUE);
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
verify_clean();
verify_unprotected();
@@ -2650,7 +2638,7 @@ write_permitted_check(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
@@ -2690,7 +2678,6 @@ write_permitted_check(void)
static unsigned
check_insert_entry(void)
{
- const char * fcn_name = "check_insert_entry";
int entry_type = PICO_ENTRY_TYPE;
int i;
herr_t result;
@@ -2956,7 +2943,7 @@ check_insert_entry(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -2983,8 +2970,6 @@ check_insert_entry(void)
static unsigned
check_flush_cache(void)
{
- const char * fcn_name = "check_flush_cache";
- hbool_t show_progress = FALSE;
H5F_t * file_ptr = NULL;
TESTING("H5C_flush_cache() functionality");
@@ -2998,11 +2983,6 @@ check_flush_cache(void)
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: reseting entries.\n", fcn_name);
- }
-
reset_entries();
file_ptr = setup_cache((size_t)(2 * 1024 * 1024),
@@ -3015,12 +2995,6 @@ check_flush_cache(void)
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: calling check_flush_cache__empty_cache().\n",
- fcn_name);
- }
-
check_flush_cache__empty_cache(file_ptr);
}
@@ -3030,45 +3004,21 @@ check_flush_cache(void)
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: calling check_flush_cache__single_entry().\n",
- fcn_name);
- }
-
check_flush_cache__single_entry(file_ptr);
}
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: calling check_flush_cache__multi_entry().\n",
- fcn_name);
- }
-
check_flush_cache__multi_entry(file_ptr);
}
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: calling check_flush_cache__flush_ops().\n",
- fcn_name);
- }
-
check_flush_cache__flush_ops(file_ptr);
}
if ( pass ) {
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s: calling takedown_cache().\n",
- fcn_name);
- }
-
takedown_cache(file_ptr, FALSE, FALSE);
}
@@ -3077,7 +3027,7 @@ check_flush_cache(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -3104,7 +3054,6 @@ check_flush_cache(void)
static void
check_flush_cache__empty_cache(H5F_t * file_ptr)
{
- /* const char * fcn_name = "check_flush_cache__empty_cache"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
herr_t result;
@@ -3199,7 +3148,6 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
static void
check_flush_cache__multi_entry(H5F_t * file_ptr)
{
- /* const char * fcn_name = "check_flush_cache__multi_entry"; */
H5C_t *cache_ptr = file_ptr->shared->cache;
if ( cache_ptr == NULL ) {
@@ -4866,7 +4814,6 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
int spec_size,
struct flush_cache_test_spec spec[])
{
- /* const char * fcn_name = "check_flush_cache__multi_entry_test"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
static char msg[128];
herr_t result;
@@ -5091,7 +5038,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
int spec_size,
struct pe_flush_cache_test_spec spec[])
{
- /* const char * fcn_name = "check_flush_cache__pe_multi_entry_test"; */
H5C_t *cache_ptr = file_ptr->shared->cache;
static char msg[128];
herr_t result;
@@ -5331,7 +5277,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
static void
check_flush_cache__flush_ops(H5F_t * file_ptr)
{
- /* const char * fcn_name = "check_flush_cache__flush_ops"; */
H5C_t *cache_ptr = file_ptr->shared->cache;
if ( cache_ptr == NULL ) {
@@ -6406,17 +6351,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -6504,17 +6449,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -6602,17 +6547,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -6732,17 +6677,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -6874,17 +6819,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -6903,17 +6848,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ FALSE,
@@ -7093,17 +7038,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -7122,17 +7067,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -7210,7 +7155,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,0,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7239,7 +7184,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,0,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7369,17 +7314,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -7398,17 +7343,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 6,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
+ /* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -7486,7 +7431,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,0,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7515,7 +7460,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,0,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7671,7 +7616,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,100,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7700,7 +7645,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,100,FALSE,0, NULL },
{ FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7808,7 +7753,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,100,FALSE,0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7837,7 +7782,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ { { FLUSH_OP__DIRTY, PICO_ENTRY_TYPE,100,FALSE,0, NULL },
{ FLUSH_OP__DIRTY, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8072,17 +8017,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ FALSE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8101,17 +8046,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8130,17 +8075,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8159,17 +8104,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8188,17 +8133,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ FALSE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8217,17 +8162,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8246,17 +8191,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8519,17 +8464,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ FALSE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8548,17 +8493,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8577,17 +8522,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 350, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8606,17 +8551,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 450, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8635,17 +8580,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 650, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ FALSE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8664,17 +8609,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {1000, 2000, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 1000, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2000, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 750, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8693,17 +8638,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {0, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 4,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL },
- { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 350, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 450, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 650, FALSE, 0, NULL },
+ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 750, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8833,17 +8778,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {100, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8862,17 +8807,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {400, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -8920,17 +8865,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {100, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -9031,17 +8976,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {100, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -9060,17 +9005,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {400, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -9118,17 +9063,17 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* pin_idx = */ {100, 0, 0, 0, 0, 0, 0, 0},
/* num_flush_ops = */ 3,
/* flush_ops = */
- /* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
+ /* op_code: type: idx: flag: size: order_ptr: */
+ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
- { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
+ { FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL } },
/* expected_loaded = */ TRUE,
/* expected_cleared = */ FALSE,
/* expected_flushed = */ TRUE,
@@ -9207,11 +9152,8 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
int check_size,
struct fo_flush_entry_check check[])
{
- const char * fcn_name = "check_flush_cache__flush_op_test";
H5C_t * cache_ptr = file_ptr->shared->cache;
static char msg[128];
- hbool_t show_progress = FALSE;
- hbool_t verbose = FALSE;
herr_t result;
int i;
int j;
@@ -9223,12 +9165,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
test_num);
#endif
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: running sanity checks on entry(1).\n",
- fcn_name, test_num, (int)pass);
- }
-
if ( cache_ptr == NULL ) {
pass = FALSE;
@@ -9256,12 +9192,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
failure_mssg = msg;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: running sanity checks on entry(2).\n",
- fcn_name, test_num, (int)pass);
- }
-
i = 0;
while ( ( pass ) && ( i < spec_size ) )
{
@@ -9284,12 +9214,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
i++;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: running sanity checks on entry(3).\n",
- fcn_name, test_num, (int)pass);
- }
-
i = 0;
while ( ( pass ) && ( i < check_size ) )
{
@@ -9327,54 +9251,18 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
i++;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Setting up the test.\n",
- fcn_name, test_num, (int)pass);
- }
-
i = 0;
while ( ( pass ) && ( i < spec_size ) )
{
if ( spec[i].insert_flag ) {
- if ( show_progress ) {
-
- HDfprintf(stdout,
- "%s:%d: Inserting entry(%d,%d) with flags 0x%x.\n",
- fcn_name, test_num,
- (int)(spec[i].entry_type),
- (int)(spec[i].entry_index),
- (unsigned)spec[i].flags);
- }
-
insert_entry(file_ptr, spec[i].entry_type, spec[i].entry_index,
spec[i].flags);
} else {
- if ( show_progress ) {
-
- HDfprintf(stdout,
- "%s:%d: Protecting entry(%d,%d).\n",
- fcn_name, test_num,
- (int)(spec[i].entry_type),
- (int)(spec[i].entry_index));
- }
-
protect_entry(file_ptr, spec[i].entry_type, spec[i].entry_index);
- if ( show_progress ) {
-
- HDfprintf(stdout,
- "%s:%d: Unprotecting entry(%d,%d) with flags 0x%x ns = %d.\n",
- fcn_name, test_num,
- (int)(spec[i].entry_type),
- (int)(spec[i].entry_index),
- (unsigned)spec[i].flags,
- (int)(spec[i].new_size));
- }
-
if(spec[i].resize_flag)
resize_entry(file_ptr, spec[i].entry_type, spec[i].entry_index,
spec[i].new_size, TRUE);
@@ -9420,12 +9308,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
}
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Running the test.\n",
- fcn_name, test_num, (int)pass);
- }
-
if ( pass ) {
result = H5C_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, H5P_DATASET_XFER_DEFAULT,
@@ -9441,11 +9323,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
}
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Checking test results(1).\n",
- fcn_name, test_num, (int)pass);
- }
i = 0;
while ( ( pass ) && ( i < spec_size ) )
@@ -9484,12 +9361,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
i++;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Checking test results(2).\n",
- fcn_name, test_num, (int)pass);
- }
-
if ( pass ) {
i = 0;
@@ -9608,12 +9479,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
}
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Checking test results(3).\n",
- fcn_name, test_num, (int)pass);
- }
-
if ( pass ) {
if ( ( ( (flush_flags & H5C__FLUSH_INVALIDATE_FLAG) == 0 )
@@ -9642,13 +9507,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
}
/* clean up the cache to prep for the next test */
-
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Cleaning up after test(1).\n",
- fcn_name, test_num, (int)pass);
- }
-
if ( pass ) {
result = H5C_flush_cache(file_ptr, H5P_DATASET_XFER_DEFAULT, H5P_DATASET_XFER_DEFAULT,
@@ -9668,16 +9526,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
( cache_ptr->dirty_index_size != 0 ) ) {
pass = FALSE;
-
- if ( verbose ) {
-
- HDfprintf(stdout, "%s:%d: il/is/cis/dis = %lld/%lld/%lld/%lld.\n",
- fcn_name, test_num,
- (long long)(cache_ptr->index_len),
- (long long)(cache_ptr->index_size),
- (long long)(cache_ptr->clean_index_size),
- (long long)(cache_ptr->dirty_index_size));
- }
HDsnprintf(msg, (size_t)128,
"Unexpected cache len/size/cs/ds after cleanup in flush op test #%d.",
test_num);
@@ -9686,12 +9534,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
}
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Cleaning up after test(2).\n",
- fcn_name, test_num, (int)pass);
- }
-
i = 0;
while ( ( pass ) && ( i < spec_size ) )
{
@@ -9708,12 +9550,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
i++;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Cleaning up after test(3).\n",
- fcn_name, test_num, (int)pass);
- }
-
i = 0;
while ( ( pass ) && ( i < check_size ) )
{
@@ -9730,11 +9566,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
i++;
}
- if ( show_progress ) {
-
- HDfprintf(stdout, "%s:%d:%d: Done.\n", fcn_name, test_num, (int)pass);
- }
-
return;
} /* check_flush_cache__flush_op_test() */
@@ -9761,7 +9592,6 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
static void
check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
{
- /* const char * fcn_name = "check_flush_cache__flush_op_eviction_test"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
int i;
int num_variable_entries = 8;
@@ -10893,8 +10723,6 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
static void
check_flush_cache__single_entry(H5F_t * file_ptr)
{
- const char * fcn_name = "check_flush_cache__single_entry";
- hbool_t show_progress = FALSE;
H5C_t * cache_ptr = file_ptr->shared->cache;
if ( cache_ptr == NULL ) {
@@ -10911,10 +10739,6 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 1);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -10929,18 +10753,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 2);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -10955,18 +10771,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 3);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -10981,18 +10789,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 4);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11007,18 +10807,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 5);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11033,18 +10825,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 6);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11059,18 +10843,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 7);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11085,18 +10861,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 8);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11111,18 +10879,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 9);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11138,18 +10898,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 10);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11165,18 +10917,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 11);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11192,18 +10936,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 12);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11219,18 +10955,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 13);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11246,18 +10974,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 14);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11273,18 +10993,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 15);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11301,18 +11013,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 16);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11329,18 +11033,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 17);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11355,18 +11051,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 18);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11381,18 +11069,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 19);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11407,18 +11087,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 20);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11433,18 +11105,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 21);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11459,18 +11123,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 22);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11485,18 +11141,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 23);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11511,18 +11159,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 24);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11537,18 +11177,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 25);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11564,18 +11196,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 26);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11591,18 +11215,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 27);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11618,18 +11234,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 28);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11645,18 +11253,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 29);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11672,18 +11272,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 30);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11699,18 +11291,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 31);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11727,18 +11311,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 32);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11755,18 +11331,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 33);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11781,18 +11349,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 34);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11807,18 +11367,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 35);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11833,18 +11385,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 36);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11859,18 +11403,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 37);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11885,18 +11421,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 38);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11911,18 +11439,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 39);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11937,18 +11457,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 40);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11963,18 +11475,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 41);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -11990,18 +11494,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 42);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12017,18 +11513,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 43);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12044,18 +11532,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 44);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12071,18 +11551,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 45);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12098,18 +11570,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 46);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12125,18 +11589,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 47);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12153,18 +11609,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 48);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12181,18 +11629,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 49);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12207,18 +11647,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 50);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12233,18 +11665,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 51);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12259,18 +11683,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 52);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12285,18 +11701,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 53);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12311,18 +11719,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 54);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12337,18 +11737,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 55);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12363,18 +11755,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 56);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12389,18 +11773,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 57);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12416,18 +11792,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 58);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12443,18 +11811,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 59);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12470,18 +11830,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 60);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12497,18 +11849,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ FALSE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 61);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12524,18 +11868,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 62);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12551,18 +11887,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ TRUE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 63);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12579,18 +11907,10 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
if ( pass ) {
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running test %d.\n", fcn_name, 64);
- }
-
check_flush_cache__single_entry_test
(
/* file_ptr */ file_ptr,
@@ -12607,10 +11927,6 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
/* expected_flushed */ FALSE,
/* expected_destroyed */ TRUE
);
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: pass = %d.\n", fcn_name, (int)pass);
- }
}
@@ -12957,11 +12273,6 @@ check_flush_cache__single_entry(H5F_t * file_ptr)
i = 0;
while ( ( pass ) && ( i < 256 ) )
{
-
- if ( show_progress ) {
- HDfprintf(stdout, "%s: running pinned test %d.\n", fcn_name, i);
- }
-
check_flush_cache__pinned_single_entry_test
(
/* file_ptr */ file_ptr,
@@ -13015,12 +12326,11 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
hbool_t expected_flushed,
hbool_t expected_destroyed)
{
- /* const char * fcn_name = "check_flush_cache__single_entry_test"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
static char msg[128];
herr_t result;
test_entry_t * base_addr;
- test_entry_t * entry_ptr;
+ test_entry_t * entry_ptr = NULL;
if ( cache_ptr == NULL ) {
@@ -13203,13 +12513,12 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
hbool_t expected_flushed,
hbool_t expected_destroyed)
{
- /* const char *fcn_name = "check_flush_cache__pinned_single_entry_test"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
static char msg[128];
hbool_t expected_loaded = TRUE;
herr_t result;
test_entry_t * base_addr;
- test_entry_t * entry_ptr;
+ test_entry_t * entry_ptr = NULL;
if ( cache_ptr == NULL ) {
@@ -13395,7 +12704,6 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
static unsigned
check_get_entry_status(void)
{
- const char * fcn_name = "check_get_entry_status";
static char msg[128];
herr_t result;
hbool_t in_cache;
@@ -13598,7 +12906,7 @@ check_get_entry_status(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -13618,7 +12926,6 @@ check_get_entry_status(void)
*
* Modifications:
*
- * None.
*
*-------------------------------------------------------------------------
*/
@@ -13626,7 +12933,6 @@ check_get_entry_status(void)
static unsigned
check_expunge_entry(void)
{
- const char * fcn_name = "check_expunge_entry";
static char msg[128];
herr_t result;
hbool_t in_cache;
@@ -13705,29 +13011,29 @@ check_expunge_entry(void)
result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
&in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
- if ( result < 0 ) {
+ if ( result < 0 ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128,
"H5C_get_entry_status() reports failure 2.");
failure_mssg = msg;
- } else if ( !in_cache || is_dirty || is_protected || is_pinned ) {
+ } else if ( !in_cache || is_dirty || is_protected || is_pinned ) {
- pass = FALSE;
- HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
- failure_mssg = msg;
+ pass = FALSE;
+ HDsnprintf(msg, (size_t)128, "Unexpected status 2.");
+ failure_mssg = msg;
} else if ( ( ! entry_ptr->loaded ) ||
( entry_ptr->cleared ) ||
( entry_ptr->flushed ) ||
( entry_ptr->destroyed ) ) {
- pass = FALSE;
- HDsnprintf(msg, (size_t)128, "Unexpected entry history 2.");
- failure_mssg = msg;
+ pass = FALSE;
+ HDsnprintf(msg, (size_t)128, "Unexpected entry history 2.");
+ failure_mssg = msg;
- }
+ }
}
/* Expunge the entry and then verify that it is no longer in the cache.
@@ -13749,29 +13055,29 @@ check_expunge_entry(void)
result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
&in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
- if ( result < 0 ) {
+ if ( result < 0 ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128,
"H5C_get_entry_status() reports failure 3.");
failure_mssg = msg;
- } else if ( in_cache ) {
+ } else if ( in_cache ) {
- pass = FALSE;
- HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
- failure_mssg = msg;
+ pass = FALSE;
+ HDsnprintf(msg, (size_t)128, "Unexpected status 3.");
+ failure_mssg = msg;
} else if ( ( ! entry_ptr->loaded ) ||
( ! entry_ptr->cleared ) ||
( entry_ptr->flushed ) ||
( ! entry_ptr->destroyed ) ) {
- pass = FALSE;
- HDsnprintf(msg, (size_t)128, "Unexpected entry history 3.");
- failure_mssg = msg;
+ pass = FALSE;
+ HDsnprintf(msg, (size_t)128, "Unexpected entry history 3.");
+ failure_mssg = msg;
- }
+ }
}
/* now repeat the process with a different entry. On unprotect
@@ -13791,14 +13097,14 @@ check_expunge_entry(void)
&in_cache, &is_dirty, &is_protected,
&is_pinned, NULL, NULL);
- if ( result < 0 ) {
+ if ( result < 0 ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128,
"H5C_get_entry_status() reports failure 4.");
failure_mssg = msg;
- } else if ( in_cache ) {
+ } else if ( in_cache ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128, "Unexpected status 4.");
@@ -13813,7 +13119,7 @@ check_expunge_entry(void)
HDsnprintf(msg, (size_t)128, "Unexpected entry history 4.");
failure_mssg = msg;
- }
+ }
}
/* protect the entry to force the cache to load it, and then unprotect
@@ -13834,14 +13140,14 @@ check_expunge_entry(void)
&in_cache, &is_dirty, &is_protected,
&is_pinned, NULL, NULL);
- if ( result < 0 ) {
+ if ( result < 0 ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128,
"H5C_get_entry_status() reports failure 5.");
failure_mssg = msg;
- } else if ( !in_cache || !is_dirty || is_protected || is_pinned ) {
+ } else if ( !in_cache || !is_dirty || is_protected || is_pinned ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128, "Unexpected status 5.");
@@ -13856,7 +13162,7 @@ check_expunge_entry(void)
HDsnprintf(msg, (size_t)128, "Unexpected entry history 5.");
failure_mssg = msg;
- }
+ }
}
/* Expunge the entry and then verify that it is no longer in the cache.
@@ -13876,17 +13182,17 @@ check_expunge_entry(void)
*/
result = H5C_get_entry_status(file_ptr, entry_ptr->addr, &entry_size,
- &in_cache, &is_dirty, &is_protected,
- &is_pinned, NULL, NULL);
+ &in_cache, &is_dirty, &is_protected,
+ &is_pinned, NULL, NULL);
- if ( result < 0 ) {
+ if ( result < 0 ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128,
"H5C_get_entry_status() reports failure 6.");
failure_mssg = msg;
- } else if ( in_cache ) {
+ } else if ( in_cache ) {
pass = FALSE;
HDsnprintf(msg, (size_t)128, "Unexpected status 6.");
@@ -13901,7 +13207,7 @@ check_expunge_entry(void)
HDsnprintf(msg, (size_t)128, "Unexpected entry history 6.");
failure_mssg = msg;
- }
+ }
}
if ( pass ) {
@@ -13914,7 +13220,7 @@ check_expunge_entry(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -13942,7 +13248,6 @@ check_expunge_entry(void)
static unsigned
check_multiple_read_protect(void)
{
- const char * fcn_name = "check_multiple_read_protect()";
H5F_t * file_ptr = NULL;
#if H5C_COLLECT_CACHE_STATS
H5C_t * cache_ptr = NULL;
@@ -14339,7 +13644,7 @@ check_multiple_read_protect(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -14367,7 +13672,6 @@ check_multiple_read_protect(void)
static unsigned
check_move_entry(void)
{
- const char * fcn_name = "check_move_entry";
int i;
H5F_t * file_ptr = NULL;
struct move_entry_test_spec test_specs[4] =
@@ -14408,13 +13712,13 @@ check_move_entry(void)
*
* At present, we should do the following tests:
*
- * 1) move a clean, unprotected, unpinned entry.
+ * 1) Move a clean, unprotected, unpinned entry.
*
- * 2) move a dirty, unprotected, unpinned entry.
+ * 2) Move a dirty, unprotected, unpinned entry.
*
- * 3) move a clean, unprotected, pinned entry.
+ * 3) Move a clean, unprotected, pinned entry.
*
- * 4) move a dirty, unprotected, pinned entry.
+ * 4) Move a dirty, unprotected, pinned entry.
*
* In all cases, the entry should have moved to its
* new location, and have been marked dirty if it wasn't
@@ -14452,7 +13756,7 @@ check_move_entry(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -14484,7 +13788,6 @@ check_move_entry__run_test(H5F_t * file_ptr,
int test_num,
struct move_entry_test_spec * spec_ptr)
{
- /* const char * fcn_name = "check_move_entry__run_test"; */
H5C_t * cache_ptr = file_ptr->shared->cache;
static char msg[128];
unsigned int flags = H5C__NO_FLAGS_SET;
@@ -14620,7 +13923,6 @@ check_move_entry__run_test(H5F_t * file_ptr,
static unsigned
check_pin_protected_entry(void)
{
- const char * fcn_name = "check_pin_protected_entry";
static char msg[128];
herr_t result;
H5F_t * file_ptr = NULL;
@@ -14695,7 +13997,7 @@ check_pin_protected_entry(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -14720,7 +14022,6 @@ check_pin_protected_entry(void)
static unsigned
check_resize_entry(void)
{
- const char * fcn_name = "check_resize_entry";
static char msg[128];
herr_t result;
hbool_t in_cache;
@@ -14732,7 +14033,7 @@ check_resize_entry(void)
H5F_t * file_ptr = NULL;
H5C_t * cache_ptr = NULL;
test_entry_t * base_addr;
- test_entry_t * entry_ptr;
+ test_entry_t * entry_ptr = NULL;
TESTING("entry resize functionality");
@@ -14787,7 +14088,7 @@ check_resize_entry(void)
base_addr = entries[LARGE_ENTRY_TYPE];
entry_ptr = &(base_addr[0]);
- entry_size = LARGE_ENTRY_SIZE;
+ entry_size = LARGE_ENTRY_SIZE;
}
}
@@ -15668,6 +14969,7 @@ check_resize_entry(void)
}
if ( pass ) {
+
protect_entry(file_ptr, LARGE_ENTRY_TYPE, 2);
unprotect_entry(file_ptr, LARGE_ENTRY_TYPE, 2, H5C__DELETED_FLAG);
@@ -15703,7 +15005,7 @@ check_resize_entry(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -15724,7 +15026,6 @@ check_resize_entry(void)
*
* Modifications:
*
- * None.
*
*-------------------------------------------------------------------------
*/
@@ -15732,7 +15033,6 @@ check_resize_entry(void)
static unsigned
check_evictions_enabled(void)
{
- const char * fcn_name = "check_evictions_enabled";
static char msg[128];
herr_t result;
hbool_t show_progress = FALSE;
@@ -15786,7 +15086,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* create the cache */
if ( pass ) {
@@ -15811,7 +15111,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that it is empty */
if ( pass ) {
@@ -15831,7 +15131,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that H5C_get_evictions_enabled() returns the expected value */
if ( pass ) {
@@ -15848,7 +15148,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -15863,7 +15163,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that the cache is full */
if ( pass ) {
@@ -15884,7 +15184,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -15896,7 +15196,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that an entry has been evicted */
if ( pass ) {
@@ -15916,7 +15216,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -15953,7 +15253,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -15964,7 +15264,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 10 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that another entry has been evicted */
if ( pass ) {
@@ -15984,7 +15284,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 11 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16020,7 +15320,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 12 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* disable evictions */
if ( pass ) {
@@ -16037,7 +15337,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 13 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that evictions are disabled */
if ( pass ) {
@@ -16057,7 +15357,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 14 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16069,7 +15369,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 15 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that no entry has been evicted */
if ( pass ) {
@@ -16089,7 +15389,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 16 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16100,7 +15400,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 17 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that no entry has been evicted */
if ( pass ) {
@@ -16120,7 +15420,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 18 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* re-enable evictions */
if ( pass ) {
@@ -16137,7 +15437,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 19 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16149,7 +15449,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 20 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that no entries have been evicted */
if ( pass ) {
@@ -16169,7 +15469,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 21 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16181,7 +15481,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 22 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that the entries have been evicted to bring the
* cache back down to its normal size.
@@ -16204,7 +15504,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 23 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16240,7 +15540,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 24 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16276,7 +15576,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 25 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* disable evictions again */
if ( pass ) {
@@ -16293,7 +15593,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 26 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16307,7 +15607,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 27 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that the cache has grown */
if ( pass ) {
@@ -16327,7 +15627,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 28 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* re-enable evictions again */
if ( pass ) {
@@ -16344,7 +15644,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 29 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16355,7 +15655,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 30 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* verify that the cache has returned to its maximum size */
if ( pass ) {
@@ -16375,7 +15675,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 31 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16411,7 +15711,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 32 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* disable evictions one last time before we shut down */
if ( pass ) {
@@ -16428,7 +15728,7 @@ check_evictions_enabled(void)
if ( show_progress ) /* 33 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -16437,14 +15737,14 @@ check_evictions_enabled(void)
if ( show_progress ) /* 34 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) { PASSED(); } else { H5_FAILED(); }
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16471,7 +15771,6 @@ check_evictions_enabled(void)
static unsigned
check_flush_protected_err(void)
{
- const char * fcn_name = "check_flush_protected_err";
H5F_t * file_ptr = NULL;
TESTING("flush cache with protected entry error");
@@ -16520,7 +15819,7 @@ check_flush_protected_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16542,6 +15841,7 @@ check_flush_protected_err(void)
*
* Modifications:
*
+ *
*-------------------------------------------------------------------------
*/
@@ -16550,7 +15850,6 @@ extern H5C_t * saved_cache;
static unsigned
check_destroy_pinned_err(void)
{
- const char * fcn_name = "check_destroy_pinned_err()";
H5F_t * file_ptr = NULL;
TESTING("destroy cache with permanently pinned entry error");
@@ -16611,7 +15910,7 @@ check_destroy_pinned_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16638,7 +15937,6 @@ check_destroy_pinned_err(void)
static unsigned
check_destroy_protected_err(void)
{
- const char * fcn_name = "check_destroy_protected_err";
H5F_t * file_ptr = NULL;
TESTING("destroy cache with protected entry error");
@@ -16697,7 +15995,7 @@ check_destroy_protected_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16724,7 +16022,6 @@ check_destroy_protected_err(void)
static unsigned
check_duplicate_insert_err(void)
{
- const char * fcn_name = "check_duplicate_insert_err";
herr_t result = -1;
H5F_t * file_ptr = NULL;
test_entry_t * base_addr;
@@ -16775,7 +16072,7 @@ check_duplicate_insert_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s(): failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16802,7 +16099,6 @@ check_duplicate_insert_err(void)
static unsigned
check_move_err(void)
{
- const char * fcn_name = "check_move_err()";
herr_t result;
H5F_t * file_ptr = NULL;
H5C_t * cache_ptr = NULL;
@@ -16870,7 +16166,7 @@ check_move_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16899,7 +16195,6 @@ check_move_err(void)
static unsigned
check_double_pin_err(void)
{
- const char * fcn_name = "check_double_pin_err()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -16958,7 +16253,7 @@ check_double_pin_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -16987,7 +16282,6 @@ check_double_pin_err(void)
static unsigned
check_double_unpin_err(void)
{
- const char * fcn_name = "check_double_unpin_err()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17057,7 +16351,7 @@ check_double_unpin_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17086,7 +16380,6 @@ check_double_unpin_err(void)
static unsigned
check_pin_entry_errs(void)
{
- const char * fcn_name = "check_pin_entry_errs()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17168,7 +16461,7 @@ check_pin_entry_errs(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17193,7 +16486,6 @@ check_pin_entry_errs(void)
static unsigned
check_double_protect_err(void)
{
- const char * fcn_name = "check_double_protect_err()";
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
H5C_cache_entry_t * cache_entry_ptr;
@@ -17246,7 +16538,7 @@ check_double_protect_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17271,7 +16563,6 @@ check_double_protect_err(void)
static unsigned
check_double_unprotect_err(void)
{
- const char * fcn_name = "check_double_unprotect_err()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17323,7 +16614,7 @@ check_double_unprotect_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17351,7 +16642,6 @@ check_double_unprotect_err(void)
static unsigned
check_mark_entry_dirty_errs(void)
{
- const char * fcn_name = "check_mark_entry_dirty_errs()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17403,7 +16693,7 @@ check_mark_entry_dirty_errs(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17432,7 +16722,6 @@ check_mark_entry_dirty_errs(void)
static unsigned
check_expunge_entry_errs(void)
{
- const char * fcn_name = "check_expunge_entry_errs()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17527,7 +16816,7 @@ check_expunge_entry_errs(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17552,7 +16841,6 @@ check_expunge_entry_errs(void)
static unsigned
check_resize_entry_errs(void)
{
- const char * fcn_name = "check_resize_entry_errs()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17629,7 +16917,7 @@ check_resize_entry_errs(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17654,7 +16942,6 @@ check_resize_entry_errs(void)
static unsigned
check_unprotect_ro_dirty_err(void)
{
- const char * fcn_name = "check_unprotect_ro_dirty_err()";
herr_t result;
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
@@ -17755,7 +17042,7 @@ check_unprotect_ro_dirty_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17784,7 +17071,6 @@ check_unprotect_ro_dirty_err(void)
static unsigned
check_protect_ro_rw_err(void)
{
- const char * fcn_name = "check_protect_ro_rw_err()";
H5F_t * file_ptr = NULL;
test_entry_t * entry_ptr;
void * thing_ptr = NULL;
@@ -17838,7 +17124,7 @@ check_protect_ro_rw_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -17867,7 +17153,6 @@ check_protect_ro_rw_err(void)
static unsigned
check_check_evictions_enabled_err(void)
{
- const char * fcn_name = "check_evictions_enabled_err()";
herr_t result;
hbool_t evictions_enabled;
H5F_t * file_ptr = NULL;
@@ -17977,7 +17262,7 @@ check_check_evictions_enabled_err(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -18010,14 +17295,14 @@ check_check_evictions_enabled_err(void)
hbool_t rpt_fcn_called = FALSE;
enum H5C_resize_status rpt_status;
-static void test_rpt_fcn(UNUSED H5C_t * cache_ptr,
- UNUSED int32_t version,
- UNUSED double hit_rate,
+static void test_rpt_fcn(H5_ATTR_UNUSED H5C_t * cache_ptr,
+ H5_ATTR_UNUSED int32_t version,
+ H5_ATTR_UNUSED double hit_rate,
enum H5C_resize_status status,
- UNUSED size_t old_max_cache_size,
- UNUSED size_t new_max_cache_size,
- UNUSED size_t old_min_clean_size,
- UNUSED size_t new_min_clean_size)
+ H5_ATTR_UNUSED size_t old_max_cache_size,
+ H5_ATTR_UNUSED size_t new_max_cache_size,
+ H5_ATTR_UNUSED size_t old_min_clean_size,
+ H5_ATTR_UNUSED size_t new_min_clean_size)
{
rpt_fcn_called = TRUE;
rpt_status = status;
@@ -18026,7 +17311,6 @@ static void test_rpt_fcn(UNUSED H5C_t * cache_ptr,
static unsigned
check_auto_cache_resize(void)
{
- const char * fcn_name = "check_auto_cache_resize()";
hbool_t show_progress = FALSE;
herr_t result;
int32_t i;
@@ -22203,7 +21487,7 @@ check_auto_cache_resize(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -22234,7 +21518,6 @@ check_auto_cache_resize(void)
static unsigned
check_auto_cache_resize_disable(void)
{
- const char * fcn_name = "check_auto_cache_resize_disable()";
hbool_t show_progress = FALSE;
herr_t result;
int32_t i;
@@ -23360,6 +22643,7 @@ check_auto_cache_resize_disable(void)
/* flush the cache and destroy all entries so we start from a known point */
flush_cache(file_ptr, TRUE, FALSE, FALSE);
+
}
if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -23586,6 +22870,7 @@ check_auto_cache_resize_disable(void)
/* flush the cache and destroy all entries so we start from a known point */
flush_cache(file_ptr, TRUE, FALSE, FALSE);
+
}
if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -23819,6 +23104,7 @@ check_auto_cache_resize_disable(void)
/* flush the cache and destroy all entries so we start from a known point */
flush_cache(file_ptr, TRUE, FALSE, FALSE);
+
}
if ( show_progress ) HDfprintf(stderr, "check point %d\n", checkpoint++);
@@ -24930,7 +24216,7 @@ check_auto_cache_resize_disable(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -24957,7 +24243,6 @@ check_auto_cache_resize_disable(void)
static unsigned
check_auto_cache_resize_epoch_markers(void)
{
- const char * fcn_name = "check_auto_cache_resize_epoch_markers()";
hbool_t show_progress = FALSE;
herr_t result;
int32_t i;
@@ -25635,7 +24920,7 @@ check_auto_cache_resize_epoch_markers(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -25667,7 +24952,6 @@ check_auto_cache_resize_epoch_markers(void)
static unsigned
check_auto_cache_resize_input_errs(void)
{
- const char * fcn_name = "check_auto_cache_resize_input_errs()";
herr_t result;
H5F_t * file_ptr = NULL;
H5C_t * cache_ptr = NULL;
@@ -28043,7 +27327,7 @@ check_auto_cache_resize_input_errs(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -28075,7 +27359,6 @@ check_auto_cache_resize_input_errs(void)
static unsigned
check_auto_cache_resize_aux_fcns(void)
{
- const char * fcn_name = "check_auto_cache_resize_aux_fcns()";
herr_t result;
int32_t i;
H5F_t * file_ptr = NULL;
@@ -28195,7 +27478,7 @@ check_auto_cache_resize_aux_fcns(void)
pass = FALSE;
failure_mssg = "H5C_get_cache_hit_rate failed.\n";
- } else if ( hit_rate > FP_EPSILON ) { /* i.e. hit_rate != 0.0 */
+ } else if ( !H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f) ) { /* i.e. hit_rate != 0.0 */
pass = FALSE;
failure_mssg =
@@ -28228,7 +27511,7 @@ check_auto_cache_resize_aux_fcns(void)
pass = FALSE;
failure_mssg = "H5C_get_cache_hit_rate failed.\n";
- } else if ( hit_rate > FP_EPSILON ) { /* i.e. hit_rate != 0.0 */
+ } else if ( !H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f) ) { /* i.e. hit_rate != 0.0 */
pass = FALSE;
failure_mssg =
@@ -28273,7 +27556,7 @@ check_auto_cache_resize_aux_fcns(void)
pass = FALSE;
failure_mssg = "H5C_get_cache_hit_rate failed.\n";
- } else if ( ! DBL_REL_EQUAL(hit_rate, 0.5f, FP_EPSILON) ) { /* i.e. hit_rate != 0.5 */
+ } else if ( ! H5_DBL_ABS_EQUAL(hit_rate, (double)0.5f) ) { /* i.e. hit_rate != 0.5 */
pass = FALSE;
failure_mssg =
@@ -28356,7 +27639,7 @@ check_auto_cache_resize_aux_fcns(void)
pass = FALSE;
failure_mssg = "H5C_get_cache_hit_rate failed.\n";
- } else if ( ! DBL_REL_EQUAL(hit_rate, 0.5F, FP_EPSILON) ) { /* i.e. hit_rate != 0.5 */
+ } else if ( ! H5_DBL_ABS_EQUAL(hit_rate, (double)0.5F) ) { /* i.e. hit_rate != 0.5 */
pass = FALSE;
failure_mssg =
@@ -28582,7 +27865,7 @@ check_auto_cache_resize_aux_fcns(void)
if ( ! pass ) {
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
}
return (unsigned)!pass;
@@ -28621,7 +27904,6 @@ check_auto_cache_resize_aux_fcns(void)
static unsigned
check_metadata_blizzard_absence(hbool_t fill_via_insertion)
{
- const char * fcn_name = "check_metadata_blizzard_absence";
int entry_type = HUGE_ENTRY_TYPE;
size_t entry_size = HUGE_ENTRY_SIZE; /* 16 KB */
H5F_t * file_ptr = NULL;
@@ -28808,7 +28090,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 0 */
HDfprintf(stdout, "\n%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -28832,7 +28114,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 1 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
/* ========================================================================
* ========================================================================
@@ -28896,7 +28178,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 2 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
/* ========================================================================
* ========================================================================
@@ -28966,7 +28248,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 3 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29020,7 +28302,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 4 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29073,7 +28355,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 5 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
/* ========================================================================
* ========================================================================
@@ -29148,7 +28430,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 6 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29220,7 +28502,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 7 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
/* ========================================================================
* ========================================================================
@@ -29280,7 +28562,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 8 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29329,7 +28611,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 9 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29380,7 +28662,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 10 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29428,7 +28710,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 11 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) {
@@ -29439,7 +28721,7 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion)
if ( show_progress) /* 12 */
HDfprintf(stdout, "%s: check point %d -- pass %d\n",
- fcn_name, checkpoint++, pass);
+ FUNC, checkpoint++, pass);
if ( pass ) { PASSED(); } else { H5_FAILED(); }
@@ -33778,5 +33060,5 @@ main(void)
nerrs += check_notify_cb();
return(nerrs > 0);
-}
+} /* main() */
diff --git a/test/cache_api.c b/test/cache_api.c
index 8f556be..6953d17 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -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,10 +67,9 @@ 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()";
char filename[512];
herr_t result;
hid_t fapl_id = -1;
@@ -487,7 +486,9 @@ check_fapl_mdc_api_calls(void)
if ( ! pass )
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
+
+ return !pass;
} /* check_fapl_mdc_api_calls() */
@@ -516,10 +517,9 @@ 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()";
char filename[512];
hid_t file_id = -1;
size_t max_size;
@@ -773,7 +773,7 @@ check_file_mdc_api_calls(void)
pass = FALSE;
failure_mssg = "H5Fget_mdc_hit_rate() failed 1.\n";
- } else if ( hit_rate != 0.0f ) {
+ } else if ( !H5_DBL_ABS_EQUAL(hit_rate, (double)0.0f) ) {
pass = FALSE;
failure_mssg =
@@ -837,7 +837,9 @@ check_file_mdc_api_calls(void)
if ( ! pass )
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
+
+ return !pass;
} /* check_file_mdc_api_calls() */
@@ -865,10 +867,9 @@ 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()";
char filename[512];
hbool_t valid_chunk;
hbool_t dump_hit_rate = FALSE;
@@ -880,7 +881,7 @@ mdc_api_call_smoke_check(int express_test)
hid_t filespace_ids[NUM_DSETS];
hid_t memspace_id = -1;
hid_t dataset_ids[NUM_DSETS];
- hid_t properties;
+ hid_t properties = -1;
char dset_name[64];
int i, j, k, l, m, n;
herr_t status;
@@ -1004,7 +1005,7 @@ mdc_api_call_smoke_check(int express_test)
HDfprintf(stdout, " Long tests disabled.\n");
- return;
+ return 0;
}
pass = TRUE;
@@ -1105,7 +1106,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 ) {
@@ -1183,8 +1184,8 @@ mdc_api_call_smoke_check(int express_test)
}
/* select on disk hyperslab */
- offset[0] = i; /*offset of hyperslab in file*/
- offset[1] = j;
+ offset[0] = (hsize_t)i; /*offset of hyperslab in file*/
+ offset[1] = (hsize_t)j;
a_size[0] = CHUNK_SIZE; /*size of hyperslab*/
a_size[1] = CHUNK_SIZE;
status = H5Sselect_hyperslab(filespace_ids[m], H5S_SELECT_SET,
@@ -1254,8 +1255,8 @@ mdc_api_call_smoke_check(int express_test)
j = (rand() % (DSET_SIZE / CHUNK_SIZE)) * CHUNK_SIZE;
/* select on disk hyperslab */
- offset[0] = i; /*offset of hyperslab in file*/
- offset[1] = j;
+ offset[0] = (hsize_t)i; /*offset of hyperslab in file*/
+ offset[1] = (hsize_t)j;
a_size[0] = CHUNK_SIZE; /*size of hyperslab*/
a_size[1] = CHUNK_SIZE;
status = H5Sselect_hyperslab(filespace_ids[m], H5S_SELECT_SET,
@@ -1329,9 +1330,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 ) )
@@ -1379,8 +1380,8 @@ mdc_api_call_smoke_check(int express_test)
j = (rand() % (DSET_SIZE / CHUNK_SIZE)) * CHUNK_SIZE;
/* select on disk hyperslab */
- offset[0] = i; /*offset of hyperslab in file*/
- offset[1] = j;
+ offset[0] = (hsize_t)i; /*offset of hyperslab in file*/
+ offset[1] = (hsize_t)j;
a_size[0] = CHUNK_SIZE; /*size of hyperslab*/
a_size[1] = CHUNK_SIZE;
status = H5Sselect_hyperslab(filespace_ids[m], H5S_SELECT_SET,
@@ -1450,7 +1451,6 @@ mdc_api_call_smoke_check(int express_test)
}
n++;
-
}
/* close file space 0 */
@@ -1513,7 +1513,9 @@ mdc_api_call_smoke_check(int express_test)
if ( ! pass )
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
+
+ return !pass;
} /* mdc_api_call_smoke_check() */
@@ -1521,6 +1523,8 @@ mdc_api_call_smoke_check(int express_test)
/* The following array of invalid external MDC cache configurations is
* used to test error rejection in the MDC related API calls.
+ *
+ * Note: It is assumed that boolean parameters are only set to TRUE/FALSE.
*/
#define NUM_INVALID_CONFIGS 42
@@ -1563,112 +1567,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 1 -- bad rpt_fcn_enabled */
- /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
- /* hbool_t rpt_fcn_enabled = */ (hbool_t)-1,
- /* hbool_t open_trace_file = */ FALSE,
- /* hbool_t close_trace_file = */ FALSE,
- /* char trace_file_name[] = */ "",
- /* hbool_t evictions_enabled = */ TRUE,
- /* hbool_t set_initial_size = */ TRUE,
- /* size_t initial_size = */ (1 * 1024 * 1024),
- /* double min_clean_fraction = */ 0.25f,
- /* size_t max_size = */ (16 * 1024 * 1024),
- /* size_t min_size = */ ( 1 * 1024 * 1024),
- /* long int epoch_length = */ 50000,
- /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
- /* double lower_hr_threshold = */ 0.9f,
- /* double increment = */ 2.0f,
- /* hbool_t apply_max_increment = */ TRUE,
- /* size_t max_increment = */ (4 * 1024 * 1024),
- /* enum H5C_cache_flash_incr_mode */
- /* flash_incr_mode = */ H5C_flash_incr__off,
- /* double flash_multiple = */ 2.0f,
- /* double flash_threshold = */ 0.5f,
- /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
- /* double upper_hr_threshold = */ 0.999f,
- /* double decrement = */ 0.9f,
- /* hbool_t apply_max_decrement = */ TRUE,
- /* size_t max_decrement = */ (1 * 1024 * 1024),
- /* int epochs_before_eviction = */ 3,
- /* hbool_t apply_empty_reserve = */ TRUE,
- /* double empty_reserve = */ 0.1f,
- /* int dirty_bytes_threshold = */ (256 * 1024),
- /* int metadata_write_strategy = */
- H5AC__DEFAULT_METADATA_WRITE_STRATEGY
- },
- {
- /* 2 -- bad open_trace_file */
- /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
- /* hbool_t rpt_fcn_enabled = */ FALSE,
- /* hbool_t open_trace_file = */ (hbool_t)-1,
- /* hbool_t close_trace_file = */ FALSE,
- /* char trace_file_name[] = */ "",
- /* hbool_t evictions_enabled = */ TRUE,
- /* hbool_t set_initial_size = */ TRUE,
- /* size_t initial_size = */ (1 * 1024 * 1024),
- /* double min_clean_fraction = */ 0.25f,
- /* size_t max_size = */ (16 * 1024 * 1024),
- /* size_t min_size = */ ( 1 * 1024 * 1024),
- /* long int epoch_length = */ 50000,
- /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
- /* double lower_hr_threshold = */ 0.9f,
- /* double increment = */ 2.0f,
- /* hbool_t apply_max_increment = */ TRUE,
- /* size_t max_increment = */ (4 * 1024 * 1024),
- /* enum H5C_cache_flash_incr_mode */
- /* flash_incr_mode = */ H5C_flash_incr__off,
- /* double flash_multiple = */ 2.0f,
- /* double flash_threshold = */ 0.5f,
- /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
- /* double upper_hr_threshold = */ 0.999f,
- /* double decrement = */ 0.9f,
- /* hbool_t apply_max_decrement = */ TRUE,
- /* size_t max_decrement = */ (1 * 1024 * 1024),
- /* int epochs_before_eviction = */ 3,
- /* hbool_t apply_empty_reserve = */ TRUE,
- /* double empty_reserve = */ 0.1f,
- /* int dirty_bytes_threshold = */ (256 * 1024),
- /* int metadata_write_strategy = */
- H5AC__DEFAULT_METADATA_WRITE_STRATEGY
- },
- {
- /* 3 -- bad close_trace_file */
- /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
- /* hbool_t rpt_fcn_enabled = */ FALSE,
- /* hbool_t open_trace_file = */ FALSE,
- /* hbool_t close_trace_file = */ (hbool_t)-1,
- /* char trace_file_name[] = */ "",
- /* hbool_t evictions_enabled = */ TRUE,
- /* hbool_t set_initial_size = */ TRUE,
- /* size_t initial_size = */ (1 * 1024 * 1024),
- /* double min_clean_fraction = */ 0.25f,
- /* size_t max_size = */ (16 * 1024 * 1024),
- /* size_t min_size = */ ( 1 * 1024 * 1024),
- /* long int epoch_length = */ 50000,
- /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
- /* double lower_hr_threshold = */ 0.9f,
- /* double increment = */ 2.0f,
- /* hbool_t apply_max_increment = */ TRUE,
- /* size_t max_increment = */ (4 * 1024 * 1024),
- /* enum H5C_cache_flash_incr_mode */
- /* flash_incr_mode = */ H5C_flash_incr__off,
- /* double flash_multiple = */ 2.0f,
- /* double flash_threshold = */ 0.5f,
- /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
- /* double upper_hr_threshold = */ 0.999f,
- /* double decrement = */ 0.9f,
- /* hbool_t apply_max_decrement = */ TRUE,
- /* size_t max_decrement = */ (1 * 1024 * 1024),
- /* int epochs_before_eviction = */ 3,
- /* hbool_t apply_empty_reserve = */ TRUE,
- /* double empty_reserve = */ 0.1f,
- /* int dirty_bytes_threshold = */ (256 * 1024),
- /* int metadata_write_strategy = */
- H5AC__DEFAULT_METADATA_WRITE_STRATEGY
- },
- {
- /* 4 -- open_trace_file == TRUE and empty trace_file_name */
+ /* 1 -- open_trace_file == TRUE and empty trace_file_name */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ TRUE,
@@ -1703,7 +1602,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 5 -- bad set_initial_size */
+ /* 2 -- bad set_initial_size */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1738,7 +1637,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 6 -- max_size too big */
+ /* 3 -- max_size too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1773,7 +1672,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 7 -- min_size too small */
+ /* 4 -- min_size too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1808,7 +1707,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 8 -- min_size > max_size */
+ /* 5 -- min_size > max_size */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1843,7 +1742,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 9 -- initial size out of range (too big) */
+ /* 6 -- initial size out of range (too big) */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1878,7 +1777,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 10 -- initial_size out of range (too small) */
+ /* 7 -- initial_size out of range (too small) */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1913,7 +1812,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 11 -- min_clean_fraction too big */
+ /* 8 -- min_clean_fraction too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1948,7 +1847,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 12 -- min_clean_fraction too small */
+ /* 9 -- min_clean_fraction too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -1983,7 +1882,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 13 -- epoch_length too small */
+ /* 10 -- epoch_length too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2018,7 +1917,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 14 -- epoch_length too big */
+ /* 11 -- epoch_length too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2053,7 +1952,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 15 -- invalid incr_mode */
+ /* 12 -- invalid incr_mode */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2088,7 +1987,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 16 -- lower_hr_threshold too small */
+ /* 13 -- lower_hr_threshold too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2123,7 +2022,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 17 -- lower_hr_threshold too big */
+ /* 14 -- lower_hr_threshold too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2158,7 +2057,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 18 -- increment too small */
+ /* 15 -- increment too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2193,42 +2092,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 19 -- bad apply_max_increment */
- /* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
- /* hbool_t rpt_fcn_enabled = */ FALSE,
- /* hbool_t open_trace_file = */ FALSE,
- /* hbool_t close_trace_file = */ FALSE,
- /* char trace_file_name[] = */ "",
- /* hbool_t evictions_enabled = */ TRUE,
- /* hbool_t set_initial_size = */ TRUE,
- /* size_t initial_size = */ (1 * 1024 * 1024),
- /* double min_clean_fraction = */ 0.25f,
- /* size_t max_size = */ (16 * 1024 * 1024),
- /* size_t min_size = */ ( 1 * 1024 * 1024),
- /* long int epoch_length = */ 50000,
- /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,
- /* double lower_hr_threshold = */ 0.9f,
- /* double increment = */ 2.0f,
- /* hbool_t apply_max_increment = */ (hbool_t)-1,
- /* size_t max_increment = */ (4 * 1024 * 1024),
- /* enum H5C_cache_flash_incr_mode */
- /* flash_incr_mode = */ H5C_flash_incr__off,
- /* double flash_multiple = */ 2.0f,
- /* double flash_threshold = */ 0.5f,
- /* enum H5C_cache_decr_mode decr_mode = */ H5C_decr__age_out_with_threshold,
- /* double upper_hr_threshold = */ 0.999f,
- /* double decrement = */ 0.9f,
- /* hbool_t apply_max_decrement = */ TRUE,
- /* size_t max_decrement = */ (1 * 1024 * 1024),
- /* int epochs_before_eviction = */ 3,
- /* hbool_t apply_empty_reserve = */ TRUE,
- /* double empty_reserve = */ 0.1f,
- /* int dirty_bytes_threshold = */ (256 * 1024),
- /* int metadata_write_strategy = */
- H5AC__DEFAULT_METADATA_WRITE_STRATEGY
- },
- {
- /* 20 -- invalid flash_incr_mode */
+ /* 16 -- invalid flash_incr_mode */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2263,7 +2127,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 21 -- flash_multiple too small */
+ /* 17 -- flash_multiple too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2298,7 +2162,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 22 -- flash_multiple too big */
+ /* 18 -- flash_multiple too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2333,7 +2197,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 23 -- flash_threshold too small */
+ /* 19 -- flash_threshold too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2368,7 +2232,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 24 -- flash_threshold too big */
+ /* 20 -- flash_threshold too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2403,7 +2267,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 25 -- bad decr_mode */
+ /* 21 -- bad decr_mode */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2438,7 +2302,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 26 -- upper_hr_threshold too big */
+ /* 22 -- upper_hr_threshold too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2473,7 +2337,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 27 -- decrement too small */
+ /* 23 -- decrement too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2508,7 +2372,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 28 -- decrement too big */
+ /* 24 -- decrement too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2543,7 +2407,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 29 -- epochs_before_eviction too small */
+ /* 25 -- epochs_before_eviction too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2578,7 +2442,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 30 -- epochs_before_eviction too big */
+ /* 26 -- epochs_before_eviction too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2613,7 +2477,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 31 -- invalid apply_empty_reserve */
+ /* 27 -- invalid apply_empty_reserve */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2648,7 +2512,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 32 -- empty_reserve too small */
+ /* 28 -- empty_reserve too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2683,7 +2547,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 33 -- empty_reserve too big */
+ /* 29 -- empty_reserve too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2718,7 +2582,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 34 -- upper_hr_threshold too small */
+ /* 30 -- upper_hr_threshold too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2753,7 +2617,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 35 -- upper_hr_threshold too big */
+ /* 31 -- upper_hr_threshold too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2788,7 +2652,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 36 -- upper_hr_threshold <= lower_hr_threshold */
+ /* 32 -- upper_hr_threshold <= lower_hr_threshold */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2823,7 +2687,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 37 -- dirty_bytes_threshold too small */
+ /* 33 -- dirty_bytes_threshold too small */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2858,7 +2722,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 38 -- dirty_bytes_threshold too big */
+ /* 34 -- dirty_bytes_threshold too big */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2893,7 +2757,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 39 -- attempt to disable evictions when auto incr enabled */
+ /* 35 -- attempt to disable evictions when auto incr enabled */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2928,7 +2792,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 40 -- attempt to disable evictions when auto decr enabled */
+ /* 36 -- attempt to disable evictions when auto decr enabled */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -2963,7 +2827,7 @@ H5AC_cache_config_t invalid_configs[NUM_INVALID_CONFIGS] =
H5AC__DEFAULT_METADATA_WRITE_STRATEGY
},
{
- /* 41 -- unknown metadata write strategy */
+ /* 37 -- unknown metadata write strategy */
/* int version = */ H5C__CURR_AUTO_SIZE_CTL_VER,
/* hbool_t rpt_fcn_enabled = */ FALSE,
/* hbool_t open_trace_file = */ FALSE,
@@ -3015,10 +2879,9 @@ 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()";
static char msg[128];
int i;
herr_t result;
@@ -3065,7 +2928,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;
@@ -3165,7 +3028,9 @@ check_fapl_mdc_api_errs(void)
if ( ! pass )
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
+
+ return !pass;
} /* check_fapl_mdc_api_errs() */
@@ -3186,10 +3051,9 @@ 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()";
char filename[512];
static char msg[128];
hbool_t show_progress = FALSE;
@@ -3217,7 +3081,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: calling h5_fixname().\n", fcn_name);
+ HDfprintf(stdout, "%s: calling h5_fixname().\n", FUNC);
}
if ( h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof(filename))
@@ -3232,7 +3096,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: calling H5Fcreate().\n", fcn_name);
+ HDfprintf(stdout, "%s: calling H5Fcreate().\n", FUNC);
}
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -3254,7 +3118,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 1.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3272,7 +3136,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 2.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3291,7 +3155,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fget_mdc_config() 3.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3313,7 +3177,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 1.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3331,7 +3195,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fset_mdc_config() 2.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3352,7 +3216,7 @@ check_file_mdc_api_errs(void)
HDfprintf(stdout,
"%s: testing H5Fset_mdc_config() with invalid config %d.\n",
- fcn_name, i);
+ FUNC, i);
}
H5E_BEGIN_TRY {
@@ -3381,7 +3245,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 1.\n",
- fcn_name);
+ FUNC);
}
H5E_BEGIN_TRY {
@@ -3400,7 +3264,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
HDfprintf(stdout, "%s: testing H5Fget_mdc_hit_rate() 2.\n",
- fcn_name);
+ FUNC);
}
H5E_BEGIN_TRY {
@@ -3421,7 +3285,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
HDfprintf(stdout, "%s: testing H5Freset_mdc_hit_rate_stats().\n",
- fcn_name);
+ FUNC);
}
H5E_BEGIN_TRY {
@@ -3442,7 +3306,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 1.\n", FUNC);
}
H5E_BEGIN_TRY {
@@ -3461,7 +3325,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", fcn_name);
+ HDfprintf(stdout, "%s: testing H5Fget_mdc_size() 2.\n", FUNC);
}
if ( ( H5Fget_mdc_size(file_id, &max_size, NULL, NULL, NULL) < 0 ) ||
@@ -3483,7 +3347,7 @@ check_file_mdc_api_errs(void)
if ( show_progress ) {
- HDfprintf(stdout, "%s: cleaning up from tests.\n", fcn_name);
+ HDfprintf(stdout, "%s: cleaning up from tests.\n", FUNC);
}
if ( H5Fclose(file_id) < 0 ) {
@@ -3502,7 +3366,9 @@ check_file_mdc_api_errs(void)
if ( ! pass )
HDfprintf(stdout, "%s: failure_mssg = \"%s\".\n",
- fcn_name, failure_mssg);
+ FUNC, failure_mssg);
+
+ return !pass;
} /* check_file_mdc_api_errs() */
@@ -3527,28 +3393,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() */
diff --git a/test/cache_common.c b/test/cache_common.c
index 0231a11..60ab827 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -19,7 +19,6 @@
* This file contains common code for tests of the cache
* implemented in H5C.c
*/
-#include "H5private.h" /* Put this first, so H5open() isn't invoked in public macros */
#include "h5test.h"
#include "H5Cprivate.h"
#include "H5Iprivate.h"
@@ -151,7 +150,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 +165,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 +240,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",
@@ -365,7 +364,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
static herr_t clear(H5F_t * f, void * thing, hbool_t dest);
static herr_t destroy(H5F_t * f, void * thing);
static herr_t flush(H5F_t *f, hid_t dxpl_id, hbool_t dest,
- haddr_t addr, void *thing, unsigned UNUSED * flags_ptr);
+ haddr_t addr, void *thing, unsigned H5_ATTR_UNUSED * flags_ptr);
static void * load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata);
static herr_t size(H5F_t * f, void * thing, size_t * size_ptr);
static herr_t notify(H5C_notify_action_t action, void *thing);
@@ -375,7 +374,7 @@ static void execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr,
-/* address translation funtions: */
+/* address translation functions: */
/*-------------------------------------------------------------------------
@@ -393,8 +392,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 +452,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: */
/*-------------------------------------------------------------------------
@@ -520,18 +475,14 @@ type_and_index_to_addr(int32_t type,
*
*-------------------------------------------------------------------------
*/
-
-herr_t
-check_write_permitted(const H5F_t UNUSED * f,
- hid_t UNUSED dxpl_id,
- hbool_t * write_permitted_ptr)
+static herr_t
+check_write_permitted(const H5F_t H5_ATTR_UNUSED *f, hbool_t *write_permitted_ptr)
{
+ HDassert(write_permitted_ptr);
- HDassert( write_permitted_ptr );
*write_permitted_ptr = write_permitted;
return(SUCCEED);
-
} /* check_write_permitted() */
@@ -682,7 +633,7 @@ notify_clear(H5F_t * f, void * thing, hbool_t dest)
*/
herr_t
-destroy(H5F_t UNUSED * f,
+destroy(H5F_t H5_ATTR_UNUSED * f,
void * thing)
{
int i;
@@ -843,14 +794,13 @@ notify_dest(H5F_t * f, void * thing)
*
*-------------------------------------------------------------------------
*/
-
herr_t
flush(H5F_t *f,
- hid_t UNUSED dxpl_id,
+ hid_t H5_ATTR_UNUSED dxpl_id,
hbool_t dest,
haddr_t
#ifdef NDEBUG
- UNUSED
+ H5_ATTR_UNUSED
#endif /* NDEBUG */
addr,
void *thing,
@@ -915,7 +865,6 @@ flush(H5F_t *f,
}
return(SUCCEED);
-
} /* flush() */
herr_t
@@ -1006,7 +955,6 @@ notify_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
return(flush(f, dxpl_id, dest, addr, thing, flags_ptr));
}
-
/*-------------------------------------------------------------------------
* Function: load & friends
@@ -1024,10 +972,10 @@ notify_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr,
*/
void *
-load(H5F_t UNUSED *f,
- hid_t UNUSED dxpl_id,
+load(H5F_t H5_ATTR_UNUSED *f,
+ hid_t H5_ATTR_UNUSED dxpl_id,
haddr_t addr,
- void UNUSED *udata)
+ void H5_ATTR_UNUSED *udata)
{
int32_t type;
int32_t idx;
@@ -1152,9 +1100,8 @@ notify_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
*
*-------------------------------------------------------------------------
*/
-
herr_t
-size(H5F_t UNUSED * f,
+size(H5F_t H5_ATTR_UNUSED * f,
void * thing,
size_t * size_ptr)
{
@@ -1178,7 +1125,6 @@ size(H5F_t UNUSED * f,
*size_ptr = entry_ptr->size;
return(SUCCEED);
-
} /* size() */
herr_t
@@ -1273,14 +1219,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 +1587,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 +1689,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];
@@ -2447,7 +2391,6 @@ H5F_t *
setup_cache(size_t max_cache_size,
size_t min_clean_size)
{
- const char * fcn_name = "setup_cache()";
char filename[512];
hbool_t show_progress = FALSE;
hbool_t verbose = TRUE;
@@ -2461,7 +2404,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 1 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
saved_fid = -1;
@@ -2478,7 +2421,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 2 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( ( pass ) && ( try_core_file_driver ) ) {
@@ -2500,7 +2443,7 @@ setup_cache(size_t max_cache_size,
core_file_driver_failed = TRUE;
if ( verbose ) {
- HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5Fcreate() with CFD failed.\n", FUNC);
}
} else {
@@ -2511,7 +2454,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 3 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
/* if we either aren't using the core file driver, or a create
* with the core file driver failed, try again with a regular file.
@@ -2529,14 +2472,14 @@ setup_cache(size_t max_cache_size,
failure_mssg = "H5Fcreate() failed.";
if ( verbose ) {
- HDfprintf(stdout, "%s: H5Fcreate() failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5Fcreate() failed.\n", FUNC);
}
}
}
if ( show_progress ) /* 4 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2550,7 +2493,7 @@ setup_cache(size_t max_cache_size,
failure_mssg = "H5Fflush() failed.";
if ( verbose ) {
- HDfprintf(stdout, "%s: H5Fflush() failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5Fflush() failed.\n", FUNC);
}
} else {
@@ -2563,7 +2506,7 @@ setup_cache(size_t max_cache_size,
failure_mssg = "Can't get file_ptr.";
if ( verbose ) {
- HDfprintf(stdout, "%s: H5Fflush() failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5Fflush() failed.\n", FUNC);
}
}
}
@@ -2571,7 +2514,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 5 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2623,7 +2566,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 6 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2633,7 +2576,7 @@ setup_cache(size_t max_cache_size,
failure_mssg = "H5C_create() failed.";
if ( verbose ) {
- HDfprintf(stdout, "%s: H5C_create() failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5C_create() failed.\n", FUNC);
}
} else if ( cache_ptr->magic != H5C__H5C_T_MAGIC ) {
@@ -2642,14 +2585,14 @@ setup_cache(size_t max_cache_size,
failure_mssg = "Bad cache_ptr magic.";
if ( verbose ) {
- HDfprintf(stdout, "%s: Bad cache_ptr magic.\n", fcn_name);
+ HDfprintf(stdout, "%s: Bad cache_ptr magic.\n", FUNC);
}
}
}
if ( show_progress ) /* 7 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) { /* allocate space for test entries */
@@ -2662,7 +2605,7 @@ setup_cache(size_t max_cache_size,
failure_mssg = "H5MF_alloc() failed.";
if ( verbose ) {
- HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", fcn_name);
+ HDfprintf(stdout, "%s: H5MF_alloc() failed.\n", FUNC);
}
} else if ( actual_base_addr > BASE_ADDR ) {
@@ -2676,7 +2619,7 @@ setup_cache(size_t max_cache_size,
if ( verbose ) {
HDfprintf(stdout, "%s: actual_base_addr > BASE_ADDR.\n",
- fcn_name);
+ FUNC);
}
}
@@ -2685,7 +2628,7 @@ setup_cache(size_t max_cache_size,
if ( show_progress ) /* 8 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
if ( pass ) {
@@ -2693,13 +2636,12 @@ setup_cache(size_t max_cache_size,
cache_ptr->ignore_tags = TRUE;
H5C_stats__reset(cache_ptr);
-
ret_val = file_ptr;
}
if ( show_progress ) /* 9 */
HDfprintf(stdout, "%s() - %0d -- pass = %d\n",
- fcn_name, mile_stone++, (int)pass);
+ FUNC, mile_stone++, (int)pass);
return(ret_val);
} /* setup_cache() */
@@ -2819,7 +2761,6 @@ expunge_entry(H5F_t * file_ptr,
int32_t type,
int32_t idx)
{
- /* const char * fcn_name = "expunge_entry()"; */
herr_t result;
test_entry_t * base_addr;
test_entry_t * entry_ptr;
@@ -2882,38 +2823,30 @@ flush_cache(H5F_t * file_ptr,
hbool_t dump_stats,
hbool_t dump_detailed_stats)
{
- const char * fcn_name = "flush_cache()";
hbool_t verbose = FALSE;
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().";
}
@@ -2925,7 +2858,7 @@ flush_cache(H5F_t * file_ptr,
if(verbose) {
HDfprintf(stdout,
"%s: unexpected il/is/cis/dis = %lld/%lld/%lld/%lld.\n",
- fcn_name,
+ FUNC,
(long long)(cache_ptr->index_len),
(long long)(cache_ptr->index_size),
(long long)(cache_ptr->clean_index_size),
@@ -3016,24 +2949,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 +3469,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 +3514,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;
@@ -3648,13 +3576,12 @@ row_major_scan_forward(H5F_t * file_ptr,
int dirty_destroys,
int dirty_unprotects)
{
- const char * fcn_name = "row_major_scan_forward";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = 0;
int32_t idx;
if ( verbose )
- HDfprintf(stdout, "%s(): entering.\n", fcn_name);
+ HDfprintf(stdout, "%s(): entering.\n", FUNC);
if ( pass ) {
@@ -3940,8 +3867,7 @@ hl_row_major_scan_forward(H5F_t * file_ptr,
hbool_t display_detailed_stats,
hbool_t do_inserts)
{
- const char * fcn_name = "hl_row_major_scan_forward";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = 0;
int32_t idx;
int32_t i;
@@ -3949,7 +3875,7 @@ hl_row_major_scan_forward(H5F_t * file_ptr,
int32_t local_max_index;
if ( verbose )
- HDfprintf(stdout, "%s(): entering.\n", fcn_name);
+ HDfprintf(stdout, "%s(): entering.\n", FUNC);
if ( pass ) {
@@ -4052,13 +3978,12 @@ row_major_scan_backward(H5F_t * file_ptr,
int dirty_destroys,
int dirty_unprotects)
{
- const char * fcn_name = "row_major_scan_backward";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = NUMBER_OF_ENTRY_TYPES - 1;
int32_t idx;
if ( verbose )
- HDfprintf(stdout, "%s(): Entering.\n", fcn_name);
+ HDfprintf(stdout, "%s(): Entering.\n", FUNC);
if ( pass ) {
@@ -4245,7 +4170,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 +4199,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;
@@ -4338,8 +4263,7 @@ hl_row_major_scan_backward(H5F_t * file_ptr,
hbool_t display_detailed_stats,
hbool_t do_inserts)
{
- const char * fcn_name = "hl_row_major_scan_backward";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = NUMBER_OF_ENTRY_TYPES - 1;
int32_t idx;
int32_t i;
@@ -4347,7 +4271,7 @@ hl_row_major_scan_backward(H5F_t * file_ptr,
int32_t local_max_index;
if ( verbose )
- HDfprintf(stdout, "%s(): entering.\n", fcn_name);
+ HDfprintf(stdout, "%s(): entering.\n", FUNC);
if ( pass ) {
@@ -4445,13 +4369,12 @@ col_major_scan_forward(H5F_t * file_ptr,
hbool_t do_inserts,
int dirty_unprotects)
{
- const char * fcn_name = "col_major_scan_forward()";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = 0;
int32_t idx;
if ( verbose )
- HDfprintf(stdout, "%s: entering.\n", fcn_name);
+ HDfprintf(stdout, "%s: entering.\n", FUNC);
if ( pass ) {
@@ -4546,8 +4469,7 @@ hl_col_major_scan_forward(H5F_t * file_ptr,
hbool_t do_inserts,
int dirty_unprotects)
{
- const char * fcn_name = "hl_col_major_scan_forward()";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = 0;
int32_t idx;
int32_t lag = 200;
@@ -4555,7 +4477,7 @@ hl_col_major_scan_forward(H5F_t * file_ptr,
int32_t local_max_index;
if ( verbose )
- HDfprintf(stdout, "%s: entering.\n", fcn_name);
+ HDfprintf(stdout, "%s: entering.\n", FUNC);
if ( pass ) {
@@ -4663,14 +4585,13 @@ col_major_scan_backward(H5F_t * file_ptr,
hbool_t do_inserts,
int dirty_unprotects)
{
- const char * fcn_name = "col_major_scan_backward()";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int mile_stone = 1;
int32_t type;
int32_t idx;
if ( verbose )
- HDfprintf(stdout, "%s: entering.\n", fcn_name);
+ HDfprintf(stdout, "%s: entering.\n", FUNC);
if ( pass ) {
@@ -4689,7 +4610,7 @@ col_major_scan_backward(H5F_t * file_ptr,
idx = MAX_ENTRIES + lag;
if ( verbose ) /* 1 */
- HDfprintf(stdout, "%s: point %d.\n", fcn_name, mile_stone++);
+ HDfprintf(stdout, "%s: point %d.\n", FUNC, mile_stone++);
while ( ( pass ) && ( (idx + lag) >= 0 ) )
@@ -4737,7 +4658,7 @@ col_major_scan_backward(H5F_t * file_ptr,
}
if ( verbose ) /* 2 */
- HDfprintf(stdout, "%s: point %d.\n", fcn_name, mile_stone++);
+ HDfprintf(stdout, "%s: point %d.\n", FUNC, mile_stone++);
if ( ( pass ) && ( display_stats ) ) {
@@ -4745,7 +4666,7 @@ col_major_scan_backward(H5F_t * file_ptr,
}
if ( verbose )
- HDfprintf(stdout, "%s: exiting.\n", fcn_name);
+ HDfprintf(stdout, "%s: exiting.\n", FUNC);
return;
@@ -4777,16 +4698,15 @@ hl_col_major_scan_backward(H5F_t * file_ptr,
hbool_t do_inserts,
int dirty_unprotects)
{
- const char * fcn_name = "hl_col_major_scan_backward()";
- H5C_t * cache_ptr;
+ H5C_t * cache_ptr = NULL;
int32_t type = 0;
- int32_t idx;
+ int32_t idx = -1;
int32_t lag = 50;
int32_t i;
- int32_t local_max_index;
+ int32_t local_max_index = -1;
if ( verbose )
- HDfprintf(stdout, "%s: entering.\n", fcn_name);
+ HDfprintf(stdout, "%s: entering.\n", FUNC);
if ( pass ) {
@@ -5113,7 +5033,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;
@@ -5171,7 +5090,7 @@ check_and_validate_cache_hit_rate(hid_t file_id,
pass = FALSE;
failure_mssg = "H5Fget_mdc_hit_rate() failed.";
- } else if ( ! DBL_REL_EQUAL(hit_rate, expected_hit_rate, 0.00001F) ) {
+ } else if ( ! H5_DBL_ABS_EQUAL(hit_rate, expected_hit_rate) ) {
pass = FALSE;
failure_mssg = "unexpected hit rate.";
@@ -5247,7 +5166,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;
@@ -5365,7 +5283,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
return(FALSE);
else if(compare_init && (a->initial_size != b->initial_size))
return(FALSE);
- else if(HDfabs(a->min_clean_fraction - b->min_clean_fraction) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->min_clean_fraction, b->min_clean_fraction))
return(FALSE);
else if(a->max_size != b->max_size)
return(FALSE);
@@ -5375,9 +5293,9 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
return(FALSE);
else if(a->incr_mode != b->incr_mode)
return(FALSE);
- else if(HDfabs(a->lower_hr_threshold - b->lower_hr_threshold) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->lower_hr_threshold, b->lower_hr_threshold))
return(FALSE);
- else if(HDfabs(a->increment - b->increment) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->increment, b->increment))
return(FALSE);
else if(a->apply_max_increment != b->apply_max_increment)
return(FALSE);
@@ -5385,15 +5303,15 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
return(FALSE);
else if(a->flash_incr_mode != b->flash_incr_mode)
return(FALSE);
- else if(HDfabs(a->flash_multiple - b->flash_multiple) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->flash_multiple, b->flash_multiple))
return(FALSE);
- else if(HDfabs(a->flash_threshold - b->flash_threshold) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->flash_threshold, b->flash_threshold))
return(FALSE);
else if(a->decr_mode != b->decr_mode)
return(FALSE);
- else if(HDfabs(a->upper_hr_threshold - b->upper_hr_threshold) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->upper_hr_threshold, b->upper_hr_threshold))
return(FALSE);
- else if(HDfabs(a->decrement - b->decrement) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->decrement, b->decrement))
return(FALSE);
else if(a->apply_max_decrement != b->apply_max_decrement)
return(FALSE);
@@ -5403,7 +5321,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a,
return(FALSE);
else if(a->apply_empty_reserve != b->apply_empty_reserve)
return(FALSE);
- else if(HDfabs(a->empty_reserve - b->empty_reserve) > FP_EPSILON)
+ else if(!H5_DBL_ABS_EQUAL(a->empty_reserve, b->empty_reserve))
return(FALSE);
return(TRUE);
}
@@ -5434,7 +5352,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;
diff --git a/test/cache_common.h b/test/cache_common.h
index 1165de4..48b95d8 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -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 ) && \
+ ( H5_DBL_ABS_EQUAL((a).min_clean_fraction, (b).min_clean_fraction) ) && \
( (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 ) && \
+ ( H5_DBL_ABS_EQUAL((a).lower_hr_threshold, (b).lower_hr_threshold) ) && \
+ ( H5_DBL_ABS_EQUAL((a).increment, (b).increment) ) && \
( (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 ) && \
+ ( H5_DBL_ABS_EQUAL((a).flash_multiple, (b).flash_multiple) ) && \
+ ( H5_DBL_ABS_EQUAL((a).flash_threshold, (b).flash_threshold) ) && \
( (a).decr_mode == (b).decr_mode ) && \
- ( (a).upper_hr_threshold == (b).upper_hr_threshold ) && \
- ( (a).decrement == (b).decrement ) && \
+ ( H5_DBL_ABS_EQUAL((a).upper_hr_threshold, (b).upper_hr_threshold) ) && \
+ ( H5_DBL_ABS_EQUAL((a).decrement, (b).decrement) ) && \
( (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 ) && \
+ ( H5_DBL_ABS_EQUAL((a).empty_reserve, (b).empty_reserve) ) && \
( (a).dirty_bytes_threshold == (b).dirty_bytes_threshold ) && \
( (a).metadata_write_strategy == (b).metadata_write_strategy ) )
@@ -481,9 +482,6 @@ if ( ( (cache_ptr) == NULL ) || \
(i).empty_reserve = (e).empty_reserve; \
}
-/* Epsilon for floating-point comparisons */
-#define FP_EPSILON 0.000001f
-
/* misc type definitions */
@@ -531,14 +529,6 @@ extern const haddr_t base_addrs[NUMBER_OF_ENTRY_TYPES];
extern const haddr_t alt_base_addrs[NUMBER_OF_ENTRY_TYPES];
extern const char * entry_type_names[NUMBER_OF_ENTRY_TYPES];
-
-/* call back function declarations: */
-
-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];
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 30ca1de..9209f6d 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -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;
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index d81b7fc..5c591f8 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -1285,16 +1285,16 @@ compare_data(void *src_data, void *dst_data, hbool_t src_subset)
s_ptr->c[3] != d_ptr->c[3] ||
s_ptr->d != d_ptr->d ||
s_ptr->e != d_ptr->e ||
- !FLT_ABS_EQUAL(s_ptr->f, d_ptr->f) ||
- !FLT_ABS_EQUAL(s_ptr->g, d_ptr->g) ||
- !FLT_ABS_EQUAL(s_ptr->h[0], d_ptr->h[0]) ||
- !FLT_ABS_EQUAL(s_ptr->h[1], d_ptr->h[1]) ||
- !FLT_ABS_EQUAL(s_ptr->i, d_ptr->i) ||
- !FLT_ABS_EQUAL(s_ptr->j, d_ptr->j) ||
- !DBL_ABS_EQUAL(s_ptr->k, d_ptr->k) ||
- !DBL_ABS_EQUAL(s_ptr->l, d_ptr->l) ||
- !DBL_ABS_EQUAL(s_ptr->m, d_ptr->m) ||
- !DBL_ABS_EQUAL(s_ptr->n, d_ptr->n) ) {
+ !H5_FLT_ABS_EQUAL(s_ptr->f, d_ptr->f) ||
+ !H5_FLT_ABS_EQUAL(s_ptr->g, d_ptr->g) ||
+ !H5_FLT_ABS_EQUAL(s_ptr->h[0], d_ptr->h[0]) ||
+ !H5_FLT_ABS_EQUAL(s_ptr->h[1], d_ptr->h[1]) ||
+ !H5_FLT_ABS_EQUAL(s_ptr->i, d_ptr->i) ||
+ !H5_FLT_ABS_EQUAL(s_ptr->j, d_ptr->j) ||
+ !H5_DBL_ABS_EQUAL(s_ptr->k, d_ptr->k) ||
+ !H5_DBL_ABS_EQUAL(s_ptr->l, d_ptr->l) ||
+ !H5_DBL_ABS_EQUAL(s_ptr->m, d_ptr->m) ||
+ !H5_DBL_ABS_EQUAL(s_ptr->n, d_ptr->n) ) {
H5_FAILED();
printf(" i=%d\n", i);
diff --git a/test/cross_read.c b/test/cross_read.c
index 35dd2ce..b2fae89 100644
--- a/test/cross_read.c
+++ b/test/cross_read.c
@@ -126,7 +126,7 @@ static int check_data(const char *dsetname, hid_t fid, hbool_t floating_number)
/* Check results */
for (j=0; j<(NX+1); j++) {
for (i=0; i<NY; i++) {
- if (!DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001F)) {
+ if (!H5_DBL_REL_EQUAL(data_out[j][i], data_in[j][i], 0.001F)) {
if (!nerrors++) {
H5_FAILED();
printf("element [%d][%d] is %g but should have been %g\n",
diff --git a/test/dsets.c b/test/dsets.c
index e9dd2ce..e6b2ee4 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1224,7 +1224,7 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
*-------------------------------------------------------------------------
*/
static htri_t
-can_apply_bogus(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
+can_apply_bogus(hid_t H5_ATTR_UNUSED dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
{
if(H5Tequal(type_id,H5T_NATIVE_DOUBLE))
return 0;
@@ -1250,9 +1250,9 @@ can_apply_bogus(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
*-------------------------------------------------------------------------
*/
static size_t
-filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t nbytes,
- size_t UNUSED *buf_size, void UNUSED **buf)
+filter_bogus(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
+ size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
{
return nbytes;
}
@@ -1274,7 +1274,7 @@ filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
*-------------------------------------------------------------------------
*/
static herr_t
-set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t UNUSED space_id)
+set_local_bogus2(hid_t dcpl_id, hid_t type_id, hid_t H5_ATTR_UNUSED space_id)
{
unsigned add_on=0; /* Value to add to data going through */
unsigned flags; /* Filter flags */
@@ -1381,9 +1381,9 @@ filter_bogus2(unsigned int flags, size_t cd_nelmts,
*-------------------------------------------------------------------------
*/
static size_t
-filter_bogus3(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t UNUSED nbytes,
- size_t UNUSED *buf_size, void UNUSED **buf)
+filter_bogus3(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t H5_ATTR_UNUSED nbytes,
+ size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
{
return 0;
}
@@ -1477,8 +1477,8 @@ error:
*-------------------------------------------------------------------------
*/
static H5Z_cb_return_t
-filter_cb_cont(H5Z_filter_t filter, void UNUSED *buf, size_t UNUSED buf_size,
- void UNUSED *op_data)
+filter_cb_cont(H5Z_filter_t filter, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNUSED buf_size,
+ void H5_ATTR_UNUSED *op_data)
{
if(H5Z_FILTER_FLETCHER32==filter)
return H5Z_CB_CONT;
@@ -1500,8 +1500,8 @@ filter_cb_cont(H5Z_filter_t filter, void UNUSED *buf, size_t UNUSED buf_size,
*-------------------------------------------------------------------------
*/
static H5Z_cb_return_t
-filter_cb_fail(H5Z_filter_t filter, void UNUSED *buf, size_t UNUSED buf_size,
- void UNUSED *op_data)
+filter_cb_fail(H5Z_filter_t filter, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNUSED buf_size,
+ void H5_ATTR_UNUSED *op_data)
{
if(H5Z_FILTER_FLETCHER32==filter)
return H5Z_CB_FAIL;
@@ -2069,7 +2069,7 @@ error:
static herr_t
test_filters(hid_t file, hid_t
#ifndef H5_HAVE_FILTER_SZIP
-UNUSED
+H5_ATTR_UNUSED
#endif /* H5_HAVE_FILTER_SZIP */
fapl)
{
@@ -5400,7 +5400,7 @@ error:
static herr_t
test_can_apply_szip(hid_t
#ifndef H5_HAVE_FILTER_SZIP
-UNUSED
+H5_ATTR_UNUSED
#endif /* H5_HAVE_FILTER_SZIP */
file)
{
@@ -5819,7 +5819,7 @@ test_set_local(hid_t fapl)
for(j=0; j<dims[1]; j++) {
/* If the difference between two values is greater than 0.001%, they're
* considered not equal. */
- if(!DBL_REL_EQUAL(points_dbl[i][j],check_dbl[i][j],0.00001F)) {
+ if(!H5_DBL_REL_EQUAL(points_dbl[i][j],check_dbl[i][j],0.00001F)) {
H5_FAILED();
printf(" Line %d: Read different values than written.\n",__LINE__);
printf(" At index %lu,%lu\n", (unsigned long)(i), (unsigned long)(j));
@@ -6760,13 +6760,13 @@ error:
#ifndef H5_NO_DEPRECATED_SYMBOLS
/* Empty can_apply and set_local callbacks */
static htri_t
-can_apply_deprec(hid_t UNUSED dcpl_id, hid_t UNUSED type_id, hid_t UNUSED space_id)
+can_apply_deprec(hid_t H5_ATTR_UNUSED dcpl_id, hid_t H5_ATTR_UNUSED type_id, hid_t H5_ATTR_UNUSED space_id)
{
return 1;
}
static herr_t
-set_local_deprec(hid_t UNUSED dcpl_id, hid_t UNUSED type_id, hid_t UNUSED space_id)
+set_local_deprec(hid_t H5_ATTR_UNUSED dcpl_id, hid_t H5_ATTR_UNUSED type_id, hid_t H5_ATTR_UNUSED space_id)
{
return(SUCCEED);
}
@@ -7127,7 +7127,7 @@ test_chunk_cache(hid_t fapl)
*/
if (H5Pget_cache(fapl_def, NULL, &nslots_1, &nbytes_1, &w0_1) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl1, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_1 != nslots_4) || (nbytes_1 != nbytes_4) || !DBL_ABS_EQUAL(w0_1, w0_4))
+ if ((nslots_1 != nslots_4) || (nbytes_1 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_1, w0_4))
FAIL_PUTS_ERROR(" Cache values from default dapl do not match those from fapl.")
/* Set a lapl property on dapl1 (to verify inheritance) */
@@ -7168,7 +7168,7 @@ test_chunk_cache(hid_t fapl)
/* Retrieve dapl from dataset, verfiy cache values are the same as on fapl_local */
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_2, w0_4))
+ if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_2, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from fapl.")
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
@@ -7190,7 +7190,7 @@ test_chunk_cache(hid_t fapl)
*/
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_3 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_3, w0_4))
+ if ((nslots_3 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_3, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from dapl1.")
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
@@ -7201,7 +7201,7 @@ test_chunk_cache(hid_t fapl)
/* Retrieve dapl from dataset, verfiy cache values are the same on fapl_local */
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_2, w0_4))
+ if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_2, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from fapl.")
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
@@ -7211,7 +7211,7 @@ test_chunk_cache(hid_t fapl)
FAIL_STACK_ERROR
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_2, w0_4))
+ if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_2, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from fapl.")
/* Don't close dapl2, we will use it in the next section */
@@ -7231,7 +7231,7 @@ test_chunk_cache(hid_t fapl)
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR /* Close dapl2, to avoid id leak */
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_2, w0_4))
+ if ((nslots_2 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_2, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from dapl2.")
/* Test H5D_CHUNK_CACHE_NSLOTS_DEFAULT and H5D_CHUNK_CACHE_W0_DEFAULT */
@@ -7244,7 +7244,7 @@ test_chunk_cache(hid_t fapl)
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR /* Close dapl2, to avoid id leak */
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_3 != nslots_4) || (nbytes_2 != nbytes_4) || !DBL_ABS_EQUAL(w0_3, w0_4))
+ if ((nslots_3 != nslots_4) || (nbytes_2 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_3, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those expected.")
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
@@ -7254,14 +7254,14 @@ test_chunk_cache(hid_t fapl)
if ((dsid = H5Oopen(fid, "dset", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
if ((dapl2 = H5Dget_access_plist(dsid)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_3 != nslots_4) || (nbytes_3 != nbytes_4) || !DBL_ABS_EQUAL(w0_3, w0_4))
+ if ((nslots_3 != nslots_4) || (nbytes_3 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_3, w0_4))
FAIL_PUTS_ERROR(" Cache values from retrieved dapl do not match those from fapl.")
if (H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
/* Verify functionality of H5Pcopy with a dapl */
if ((dapl2 = H5Pcopy(dapl1)) < 0) FAIL_STACK_ERROR
if (H5Pget_chunk_cache(dapl2, &nslots_4, &nbytes_4, &w0_4) < 0) FAIL_STACK_ERROR
- if ((nslots_3 != nslots_4) || (nbytes_1 != nbytes_4) || !DBL_ABS_EQUAL(w0_3, w0_4))
+ if ((nslots_3 != nslots_4) || (nbytes_1 != nbytes_4) || !H5_DBL_ABS_EQUAL(w0_3, w0_4))
FAIL_PUTS_ERROR(" Cache values from dapl2 do not match those from dapl1.")
/* Close */
@@ -7489,9 +7489,9 @@ static size_t filter_expand_factor_g = 0;
*-------------------------------------------------------------------------
*/
static size_t
-filter_expand(unsigned int flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t nbytes,
- size_t *buf_size, void UNUSED **buf)
+filter_expand(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
+ size_t *buf_size, void H5_ATTR_UNUSED **buf)
{
size_t ret_value = 0;
@@ -8890,8 +8890,8 @@ error:
*-------------------------------------------------------------------------
*/
static herr_t
-gather_error_cb_fail(const void UNUSED *dst_buf,
- size_t UNUSED dst_buf_bytes_used, void UNUSED *op_data)
+gather_error_cb_fail(const void H5_ATTR_UNUSED *dst_buf,
+ size_t H5_ATTR_UNUSED dst_buf_bytes_used, void H5_ATTR_UNUSED *op_data)
{
return FAIL;
}
diff --git a/test/dt_arith.c b/test/dt_arith.c
index c5b72d4..8ededc7 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -415,7 +415,7 @@ static int my_isinf(int endian, unsigned char *val, size_t size,
*-------------------------------------------------------------------------
*/
static void
-fpe_handler(int UNUSED signo)
+fpe_handler(int H5_ATTR_UNUSED signo)
{
SKIPPED();
HDputs(" Test skipped due to SIGFPE.");
@@ -488,7 +488,7 @@ reset_hdf5(void)
*-------------------------------------------------------------------------
*/
static H5T_conv_ret_t
-except_func(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst_id, void UNUSED *src_buf,
+except_func(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5_ATTR_UNUSED dst_id, void H5_ATTR_UNUSED *src_buf,
void *dst_buf, void *user_data)
{
H5T_conv_ret_t ret = H5T_CONV_HANDLED;
@@ -677,7 +677,7 @@ test_hard_query(void)
*-------------------------------------------------------------------------
*/
static H5T_conv_ret_t
-expt_handle(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst_id, void UNUSED *src_buf,
+expt_handle(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5_ATTR_UNUSED dst_id, void H5_ATTR_UNUSED *src_buf,
void *dst_buf, void *user_data)
{
signed char fill_value1 = 7;
diff --git a/test/dtypes.c b/test/dtypes.c
index b2783c3..59cf000 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -4814,10 +4814,10 @@ test_bitfield_funcs(void)
*-------------------------------------------------------------------------
*/
static herr_t
-convert_opaque(hid_t UNUSED st, hid_t UNUSED dt, H5T_cdata_t *cdata,
- size_t UNUSED nelmts, size_t UNUSED buf_stride,
- size_t UNUSED bkg_stride, void UNUSED *_buf,
- void UNUSED *bkg, hid_t UNUSED dset_xfer_plid)
+convert_opaque(hid_t H5_ATTR_UNUSED st, hid_t H5_ATTR_UNUSED dt, H5T_cdata_t *cdata,
+ size_t H5_ATTR_UNUSED nelmts, size_t H5_ATTR_UNUSED buf_stride,
+ size_t H5_ATTR_UNUSED bkg_stride, void H5_ATTR_UNUSED *_buf,
+ void H5_ATTR_UNUSED *bkg, hid_t H5_ATTR_UNUSED dset_xfer_plid)
{
if (H5T_CONV_CONV==cdata->command) num_opaque_conversions_g++;
return 0;
@@ -5872,8 +5872,8 @@ typedef struct {
} except_info_t;
static H5T_conv_ret_t
-conv_except(H5T_conv_except_t except_type, hid_t UNUSED src_id, hid_t UNUSED dst_id,
- void UNUSED *src_buf, void UNUSED *dst_buf, void *_user_data)
+conv_except(H5T_conv_except_t except_type, hid_t H5_ATTR_UNUSED src_id, hid_t H5_ATTR_UNUSED dst_id,
+ void H5_ATTR_UNUSED *src_buf, void H5_ATTR_UNUSED *dst_buf, void *_user_data)
{
except_info_t *user_data = (except_info_t *)_user_data;
diff --git a/test/earray.c b/test/earray.c
index 2d0a399..8a355c8 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -190,7 +190,6 @@ const H5AC_class_t H5AC_EARRAY_TEST[1] = {{
(H5AC_size_func_t)earray_cache_test_size,
}};
-
/*-------------------------------------------------------------------------
* Function: init_cparam
@@ -625,7 +624,7 @@ error:
*-------------------------------------------------------------------------
*/
static earray_test_t *
-earray_cache_test_load(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, const void UNUSED *udata1, void UNUSED *udata2)
+earray_cache_test_load(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t H5_ATTR_UNUSED addr, const void H5_ATTR_UNUSED *udata1, void H5_ATTR_UNUSED *udata2)
{
/* Check arguments */
HDassert(f);
@@ -652,7 +651,7 @@ earray_cache_test_load(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED add
*-------------------------------------------------------------------------
*/
static herr_t
-earray_cache_test_flush(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, hbool_t destroy, haddr_t UNUSED addr, earray_test_t *test, unsigned UNUSED * flags_ptr)
+earray_cache_test_flush(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t destroy, haddr_t H5_ATTR_UNUSED addr, earray_test_t *test, unsigned H5_ATTR_UNUSED * flags_ptr)
{
/* check arguments */
HDassert(f);
@@ -723,7 +722,7 @@ error:
*-------------------------------------------------------------------------
*/
herr_t
-earray_cache_test_dest(H5F_t UNUSED *f, earray_test_t *test)
+earray_cache_test_dest(H5F_t H5_ATTR_UNUSED *f, earray_test_t *test)
{
/*
* Check arguments.
@@ -788,7 +787,7 @@ error:
*-------------------------------------------------------------------------
*/
static herr_t
-earray_cache_test_size(const H5F_t UNUSED *f, const earray_test_t UNUSED *test, size_t *size_ptr)
+earray_cache_test_size(const H5F_t H5_ATTR_UNUSED *f, const earray_test_t H5_ATTR_UNUSED *test, size_t *size_ptr)
{
/* check arguments */
HDassert(f);
@@ -817,7 +816,7 @@ earray_cache_test_size(const H5F_t UNUSED *f, const earray_test_t UNUSED *test,
*-------------------------------------------------------------------------
*/
static unsigned
-test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED *tparam)
+test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
H5F_t *f = NULL; /* Internal file object pointer */
@@ -1395,7 +1394,7 @@ test_flush_depend_cb(const void *_elmt, size_t nelmts, void *udata)
*-------------------------------------------------------------------------
*/
static unsigned
-test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED *tparam)
+test_flush_depend(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
H5F_t *f = NULL; /* Internal file object pointer */
@@ -1630,8 +1629,8 @@ typedef struct eiter_fw_t {
*-------------------------------------------------------------------------
*/
static void *
-eiter_fw_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam,
- hsize_t UNUSED cnt)
+eiter_fw_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_param_t H5_ATTR_UNUSED *tparam,
+ hsize_t H5_ATTR_UNUSED cnt)
{
eiter_fw_t *eiter; /* Forward element iteration object */
@@ -2075,7 +2074,7 @@ typedef struct eiter_rnd_t {
*-------------------------------------------------------------------------
*/
static void *
-eiter_rnd_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam,
+eiter_rnd_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_param_t H5_ATTR_UNUSED *tparam,
hsize_t cnt)
{
eiter_rnd_t *eiter; /* Random element iteration object */
@@ -2228,7 +2227,7 @@ static const earray_iter_t ea_iter_rnd = {
*-------------------------------------------------------------------------
*/
static void *
-eiter_rnd2_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam,
+eiter_rnd2_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_param_t H5_ATTR_UNUSED *tparam,
hsize_t cnt)
{
eiter_rnd_t *eiter; /* Random element iteration object */
@@ -2312,7 +2311,7 @@ typedef struct eiter_cyc_t {
*-------------------------------------------------------------------------
*/
static void *
-eiter_cyc_init(const H5EA_create_t UNUSED *cparam, const earray_test_param_t UNUSED *tparam,
+eiter_cyc_init(const H5EA_create_t H5_ATTR_UNUSED *cparam, const earray_test_param_t H5_ATTR_UNUSED *tparam,
hsize_t cnt)
{
eiter_cyc_t *eiter; /* Cyclic element iteration object */
diff --git a/test/error_test.c b/test/error_test.c
index 0d945d2..e712d86 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -314,7 +314,7 @@ error:
*-------------------------------------------------------------------------
*/
static herr_t
-long_desc_cb(unsigned UNUSED n, const H5E_error2_t *err_desc, void *client_data)
+long_desc_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *client_data)
{
char *real_desc = (char *)client_data;
diff --git a/test/farray.c b/test/farray.c
index 7a79aaa..4c18916 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -440,7 +440,7 @@ error:
*-------------------------------------------------------------------------
*/
static unsigned
-test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t UNUSED *tparam)
+test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
H5F_t *f = NULL; /* Internal file object pointer */
@@ -852,8 +852,8 @@ typedef struct fiter_fw_t {
*-------------------------------------------------------------------------
*/
static void *
-fiter_fw_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
- hsize_t UNUSED cnt)
+fiter_fw_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_param_t H5_ATTR_UNUSED *tparam,
+ hsize_t H5_ATTR_UNUSED cnt)
{
fiter_fw_t *fiter; /* Forward element iteration object */
@@ -941,8 +941,8 @@ typedef struct fiter_rv_t {
*-------------------------------------------------------------------------
*/
static void *
-fiter_rv_init(const H5FA_create_t *cparam, const farray_test_param_t UNUSED *tparam,
- hsize_t UNUSED cnt)
+fiter_rv_init(const H5FA_create_t *cparam, const farray_test_param_t H5_ATTR_UNUSED *tparam,
+ hsize_t H5_ATTR_UNUSED cnt)
{
fiter_rv_t *fiter; /* Reverse element iteration object */
@@ -1008,7 +1008,7 @@ typedef struct fiter_rnd_t {
*-------------------------------------------------------------------------
*/
static void *
-fiter_rnd_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
+fiter_rnd_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_param_t H5_ATTR_UNUSED *tparam,
hsize_t cnt)
{
fiter_rnd_t *fiter; /* Random element iteration object */
@@ -1126,7 +1126,7 @@ typedef struct fiter_cyc_t {
*-------------------------------------------------------------------------
*/
static void *
-fiter_cyc_init(const H5FA_create_t UNUSED *cparam, const farray_test_param_t UNUSED *tparam,
+fiter_cyc_init(const H5FA_create_t H5_ATTR_UNUSED *cparam, const farray_test_param_t H5_ATTR_UNUSED *tparam,
hsize_t cnt)
{
fiter_cyc_t *fiter; /* Cyclic element iteration object */
diff --git a/test/fheap.c b/test/fheap.c
index 6bcd8bf..fee6fdf 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -1827,7 +1827,7 @@ error:
*-------------------------------------------------------------------------
*/
static unsigned
-test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam)
+test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
char filename[FHEAP_FILENAME_LEN]; /* Filename to use */
@@ -1944,7 +1944,7 @@ error:
*-------------------------------------------------------------------------
*/
static unsigned
-test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam)
+test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
char filename[FHEAP_FILENAME_LEN]; /* Filename to use */
@@ -2090,7 +2090,7 @@ error:
*-------------------------------------------------------------------------
*/
static unsigned
-test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam)
+test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
hid_t file2 = -1; /* File ID */
@@ -2262,7 +2262,7 @@ error:
*-------------------------------------------------------------------------
*/
static unsigned
-test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam)
+test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t H5_ATTR_UNUSED *tparam)
{
hid_t file = -1; /* File ID */
char filename[FHEAP_FILENAME_LEN]; /* Filename to use */
@@ -15884,9 +15884,9 @@ error:
/* Custom filter used to verify that the filters are actually called and do not
* just silently fail */
static hbool_t test_write_filter_called;
-static size_t test_write_filter(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED cd_values[], size_t nbytes, size_t UNUSED *buf_size,
- void UNUSED **buf)
+static size_t test_write_filter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED cd_values[], size_t nbytes, size_t H5_ATTR_UNUSED *buf_size,
+ void H5_ATTR_UNUSED **buf)
{
test_write_filter_called = TRUE;
diff --git a/test/fillval.c b/test/fillval.c
index e7ad521..c791504 100644
--- a/test/fillval.c
+++ b/test/fillval.c
@@ -1301,7 +1301,7 @@ error:
*-------------------------------------------------------------------------
*/
static int
-test_extend_release_integer(void UNUSED *_elmt)
+test_extend_release_integer(void H5_ATTR_UNUSED *_elmt)
{
return 0;
} /* end test_extend_release_integer() */
diff --git a/test/filter_fail.c b/test/filter_fail.c
index 3dbb564..0b92abb 100644
--- a/test/filter_fail.c
+++ b/test/filter_fail.c
@@ -65,8 +65,8 @@ const H5Z_class2_t H5Z_FAIL_TEST[1] = {{
*-------------------------------------------------------------------------
*/
static size_t
-filter_fail(unsigned int flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t nbytes,
+filter_fail(unsigned int flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
size_t *buf_size, void **buf)
{
int *dst = (int*)(*buf);
diff --git a/test/freespace.c b/test/freespace.c
index 9ab0d75..1338ae7 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -85,8 +85,8 @@ typedef struct TEST_free_section_t {
static herr_t TEST_sect_init_cls(H5FS_section_class_t *, void *);
static herr_t TEST_sect_free(H5FS_section_info_t *_sect);
-static herr_t TEST_sect_can_merge(const H5FS_section_info_t *, const H5FS_section_info_t *, void UNUSED *);
-static herr_t TEST_sect_merging(H5FS_section_info_t *, H5FS_section_info_t *, void UNUSED *);
+static herr_t TEST_sect_can_merge(const H5FS_section_info_t *, const H5FS_section_info_t *, void H5_ATTR_UNUSED *);
+static herr_t TEST_sect_merging(H5FS_section_info_t *, H5FS_section_info_t *, void H5_ATTR_UNUSED *);
static herr_t TEST_sect_can_shrink(const H5FS_section_info_t *, void *);
static herr_t TEST_sect_shrinking(H5FS_section_info_t **, void *);
@@ -223,7 +223,7 @@ TEST_sect_init_cls(H5FS_section_class_t *cls, void *_udata)
*/
static herr_t
TEST_sect_can_merge(const H5FS_section_info_t *_sect1,
- const H5FS_section_info_t *_sect2, void UNUSED *_udata)
+ const H5FS_section_info_t *_sect2, void H5_ATTR_UNUSED *_udata)
{
const TEST_free_section_t *sect1 = (const TEST_free_section_t *)_sect1;
const TEST_free_section_t *sect2 = (const TEST_free_section_t *)_sect2;
@@ -246,7 +246,7 @@ TEST_sect_can_merge(const H5FS_section_info_t *_sect1,
*/
static herr_t
TEST_sect_merging(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
- void UNUSED *_udata)
+ void H5_ATTR_UNUSED *_udata)
{
TEST_free_section_t *sect1 = (TEST_free_section_t *)_sect1;
TEST_free_section_t *sect2 = (TEST_free_section_t *)_sect2;
diff --git a/test/gen_filters.c b/test/gen_filters.c
index b44339d..f506602 100644
--- a/test/gen_filters.c
+++ b/test/gen_filters.c
@@ -123,9 +123,9 @@ const H5Z_class2_t H5Z_BOGUS[1] = {{
*-------------------------------------------------------------------------
*/
static size_t
-filter_bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t nbytes,
- size_t UNUSED *buf_size, void UNUSED **buf)
+filter_bogus(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
+ size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
{
return nbytes;
}
diff --git a/test/h5test.c b/test/h5test.c
index 693760c..fefacda 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -113,7 +113,7 @@ static char * h5_fixname_real(const char *base_name, hid_t fapl, const char *suf
*-------------------------------------------------------------------------
*/
static herr_t
-h5_errors(hid_t estack, void UNUSED *client_data)
+h5_errors(hid_t estack, void H5_ATTR_UNUSED *client_data)
{
H5_FAILED();
H5Eprint2(estack, stdout);
@@ -700,21 +700,24 @@ h5_show_hostname(void)
{
char hostname[80];
#ifdef H5_HAVE_WIN32_API
- WSADATA wsaData;
- int err;
+ WSADATA wsaData;
+ int err;
#endif
/* try show the process or thread id in multiple processes cases*/
#ifdef H5_HAVE_PARALLEL
{
- int mpi_rank, mpi_initialized;
-
- MPI_Initialized(&mpi_initialized);
- if (mpi_initialized){
- MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
- printf("MPI-process %d.", mpi_rank);
- }else
- printf("thread 0.");
+ int mpi_rank, mpi_initialized, mpi_finalized;
+
+ MPI_Initialized(&mpi_initialized);
+ MPI_Finalized(&mpi_finalized);
+
+ if(mpi_initialized && !mpi_finalized) {
+ MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
+ printf("MPI-process %d.", mpi_rank);
+ }
+ else
+ printf("thread 0.");
}
#elif defined(H5_HAVE_THREADSAFE)
printf("thread %lu.", HDpthread_self_ulong());
@@ -723,31 +726,31 @@ h5_show_hostname(void)
#endif
#ifdef H5_HAVE_WIN32_API
- err = WSAStartup( MAKEWORD(2,2), &wsaData );
- if ( err != 0 ) {
- /* could not find a usable WinSock DLL */
- return;
- }
-
-/* Confirm that the WinSock DLL supports 2.2.*/
-/* Note that if the DLL supports versions greater */
-/* than 2.2 in addition to 2.2, it will still return */
-/* 2.2 in wVersion since that is the version we */
-/* requested. */
-
- if ( LOBYTE( wsaData.wVersion ) != 2 ||
- HIBYTE( wsaData.wVersion ) != 2 ) {
- /* could not find a usable WinSock DLL */
- WSACleanup( );
- return;
- }
+ err = WSAStartup( MAKEWORD(2,2), &wsaData );
+ if ( err != 0 ) {
+ /* could not find a usable WinSock DLL */
+ return;
+ }
+
+ /* Confirm that the WinSock DLL supports 2.2.*/
+ /* Note that if the DLL supports versions greater */
+ /* than 2.2 in addition to 2.2, it will still return */
+ /* 2.2 in wVersion since that is the version we */
+ /* requested. */
+
+ if ( LOBYTE( wsaData.wVersion ) != 2 ||
+ HIBYTE( wsaData.wVersion ) != 2 ) {
+ /* could not find a usable WinSock DLL */
+ WSACleanup( );
+ return;
+ }
#endif
#ifdef H5_HAVE_GETHOSTNAME
if (gethostname(hostname, (size_t)80) < 0)
- printf(" gethostname failed\n");
+ printf(" gethostname failed\n");
else
- printf(" hostname=%s\n", hostname);
+ printf(" hostname=%s\n", hostname);
#else
printf(" gethostname not supported\n");
#endif
@@ -1099,61 +1102,62 @@ int h5_szip_can_encode(void )
char *
getenv_all(MPI_Comm comm, int root, const char* name)
{
- int mpi_size, mpi_rank, mpi_initialized;
+ int mpi_size, mpi_rank, mpi_initialized, mpi_finalized;
int len;
static char* env = NULL;
assert(name);
MPI_Initialized(&mpi_initialized);
- if(!mpi_initialized) {
- /* use original getenv */
- if(env)
- HDfree(env);
- env = HDgetenv(name);
- } /* end if */
- else {
- MPI_Comm_rank(comm, &mpi_rank);
- MPI_Comm_size(comm, &mpi_size);
- assert(root < mpi_size);
-
- /* The root task does the getenv call
- * and sends the result to the other tasks */
- if(mpi_rank == root) {
- env = HDgetenv(name);
- if(env) {
- len = (int)HDstrlen(env);
- MPI_Bcast(&len, 1, MPI_INT, root, comm);
- MPI_Bcast(env, len, MPI_CHAR, root, comm);
- }
- else {
- /* len -1 indicates that the variable was not in the environment */
- len = -1;
- MPI_Bcast(&len, 1, MPI_INT, root, comm);
- }
- }
- else {
- MPI_Bcast(&len, 1, MPI_INT, root, comm);
- if(len >= 0) {
- if(env == NULL)
- env = (char*) HDmalloc((size_t)len+1);
- else if(HDstrlen(env) < (size_t)len)
- env = (char*) HDrealloc(env, (size_t)len+1);
-
- MPI_Bcast(env, len, MPI_CHAR, root, comm);
- env[len] = '\0';
- }
- else {
- if(env)
- HDfree(env);
- env = NULL;
- }
- }
- }
-
+ MPI_Finalized(&mpi_finalized);
+
+ if(mpi_initialized && !mpi_finalized) {
+ MPI_Comm_rank(comm, &mpi_rank);
+ MPI_Comm_size(comm, &mpi_size);
+ assert(root < mpi_size);
+
+ /* The root task does the getenv call
+ * and sends the result to the other tasks */
+ if(mpi_rank == root) {
+ env = HDgetenv(name);
+ if(env) {
+ len = (int)HDstrlen(env);
+ MPI_Bcast(&len, 1, MPI_INT, root, comm);
+ MPI_Bcast(env, len, MPI_CHAR, root, comm);
+ }
+ else {
+ /* len -1 indicates that the variable was not in the environment */
+ len = -1;
+ MPI_Bcast(&len, 1, MPI_INT, root, comm);
+ }
+ }
+ else {
+ MPI_Bcast(&len, 1, MPI_INT, root, comm);
+ if(len >= 0) {
+ if(env == NULL)
+ env = (char*) HDmalloc((size_t)len+1);
+ else if(HDstrlen(env) < (size_t)len)
+ env = (char*) HDrealloc(env, (size_t)len+1);
+
+ MPI_Bcast(env, len, MPI_CHAR, root, comm);
+ env[len] = '\0';
+ }
+ else {
+ if(env)
+ HDfree(env);
+ env = NULL;
+ }
+ }
#ifndef NDEBUG
- MPI_Barrier(comm);
+ MPI_Barrier(comm);
#endif
+ }
+ else {
+ /* use original getenv */
+ if(env)
+ HDfree(env);
+ env = HDgetenv(name);
+ } /* end if */
return env;
}
@@ -1222,8 +1226,8 @@ h5_make_local_copy(const char *origfilename, const char *local_copy_name)
*-------------------------------------------------------------------------
*/
static herr_t
-h5_verify_cached_stabs_cb(hid_t oid, const char UNUSED *name,
- const H5O_info_t *oinfo, void UNUSED *udata)
+h5_verify_cached_stabs_cb(hid_t oid, const char H5_ATTR_UNUSED *name,
+ const H5O_info_t *oinfo, void H5_ATTR_UNUSED *udata)
{
if(oinfo->type == H5O_TYPE_GROUP)
return(H5G__verify_cached_stabs_test(oid));
diff --git a/test/h5test.h b/test/h5test.h
index ce224d8..fa0c11b 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -118,24 +118,6 @@ H5TEST_DLLVAR MPI_Info h5_io_info_g; /* MPI INFO object for IO */
#define ALARM_ON TestAlarmOn()
#define ALARM_OFF HDalarm(0)
-/*
- * The methods to compare the equality of floating-point values:
- * 1. XXX_ABS_EQUAL - check if the difference is smaller than the
- * Epsilon value. The Epsilon values, FLT_EPSILON, DBL_EPSILON,
- * and LDBL_EPSILON, are defined by compiler in float.h.
- * 2. XXX_REL_EQUAL - check if the relative difference is smaller than a
- * predefined value M. See if two values are relatively equal.
- * It's the test's responsibility not to pass in the value 0, which
- * may cause the equation to fail.
- */
-#define FLT_ABS_EQUAL(X,Y) ((float)fabs(X-Y)<FLT_EPSILON)
-#define DBL_ABS_EQUAL(X,Y) (fabs(X-Y)<DBL_EPSILON)
-#define LDBL_ABS_EQUAL(X,Y) (fabsl(X-Y)<LDBL_EPSILON)
-
-#define FLT_REL_EQUAL(X,Y,M) (fabsf((Y-X)/X<M)
-#define DBL_REL_EQUAL(X,Y,M) (fabs((Y-X)/X)<M)
-#define LDBL_REL_EQUAL(X,Y,M) (fabsl((Y-X)/X)<M)
-
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/test/hyperslab.c b/test/hyperslab.c
index 9bc085c..2cf47b1 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -644,7 +644,7 @@ test_multifill(size_t nx)
for(i = 0; i < nx; i++) {
if(dst[i].left != 3333333)
sprintf(s, "bad dst[%lu].left", (unsigned long)i);
- else if(!DBL_ABS_EQUAL(dst[i].mid, fill.mid))
+ else if(!H5_DBL_ABS_EQUAL(dst[i].mid, fill.mid))
/* Check if two DOUBLE values are equal. If their difference
* is smaller than the EPSILON value for double, they are
* considered equal. See the definition in h5test.h.
diff --git a/test/links.c b/test/links.c
index 0846c49..cfbc4a1 100644
--- a/test/links.c
+++ b/test/links.c
@@ -7320,8 +7320,8 @@ error:
/* Callback functions for UD hard links. */
/* UD_hard_create increments the object's reference count */
static herr_t
-UD_hard_create(const char UNUSED * link_name, hid_t loc_group, const void *udata,
- size_t udata_size, hid_t UNUSED lcpl_id)
+UD_hard_create(const char H5_ATTR_UNUSED * link_name, hid_t loc_group, const void *udata,
+ size_t udata_size, hid_t H5_ATTR_UNUSED lcpl_id)
{
haddr_t addr;
hid_t target_obj = -1;
@@ -7389,8 +7389,8 @@ done:
/* Traverse a hard link by opening the object */
static hid_t
-UD_hard_traverse(const char UNUSED *link_name, hid_t cur_group,
- const void *udata, size_t udata_size, hid_t UNUSED lapl_id)
+UD_hard_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
+ const void *udata, size_t udata_size, hid_t H5_ATTR_UNUSED lapl_id)
{
haddr_t addr;
hid_t ret_value = -1;
@@ -7407,7 +7407,7 @@ UD_hard_traverse(const char UNUSED *link_name, hid_t cur_group,
/* UD_hard_delete decrements the object's reference count */
static herr_t
-UD_hard_delete(const char UNUSED * link_name, hid_t file, const void *udata,
+UD_hard_delete(const char H5_ATTR_UNUSED * link_name, hid_t file, const void *udata,
size_t udata_size)
{
haddr_t addr;
@@ -7625,8 +7625,8 @@ ud_hard_links(hid_t fapl)
* in the current group named REREG_TARGET_NAME
*/
static hid_t
-UD_rereg_traverse(const char UNUSED * link_name, hid_t cur_group,
- const void UNUSED *udata, size_t UNUSED udata_size, hid_t lapl_id)
+UD_rereg_traverse(const char H5_ATTR_UNUSED * link_name, hid_t cur_group,
+ const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id)
{
hid_t ret_value;
@@ -8064,8 +8064,8 @@ error:
*-------------------------------------------------------------------------
*/
static hid_t
-UD_plist_traverse(const char UNUSED * link_name, hid_t cur_group,
- const void UNUSED *udata, size_t udata_size, hid_t lapl_id)
+UD_plist_traverse(const char H5_ATTR_UNUSED * link_name, hid_t cur_group,
+ const void H5_ATTR_UNUSED *udata, size_t udata_size, hid_t lapl_id)
{
char target[NAME_BUF_SIZE];
hid_t ret_value;
@@ -8203,8 +8203,8 @@ lapl_udata(hid_t fapl, hbool_t new_format)
*-------------------------------------------------------------------------
*/
static herr_t
-UD_cbsucc_create(const char UNUSED * link_name, hid_t UNUSED loc_group,
- const void *udata, size_t udata_size, hid_t UNUSED lcpl_id)
+UD_cbsucc_create(const char H5_ATTR_UNUSED * link_name, hid_t H5_ATTR_UNUSED loc_group,
+ const void *udata, size_t udata_size, hid_t H5_ATTR_UNUSED lcpl_id)
{
/* Check to make sure that this "soft link" has a target */
if(udata_size < 1 || !udata)
@@ -8214,8 +8214,8 @@ UD_cbsucc_create(const char UNUSED * link_name, hid_t UNUSED loc_group,
} /* end UD_cbsucc_create() */
static hid_t
-UD_cbsucc_traverse(const char UNUSED *link_name, hid_t cur_group,
- const void *udata, size_t UNUSED udata_size, hid_t lapl_id)
+UD_cbsucc_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group,
+ const void *udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id)
{
const char *target = (const char *)udata;
hid_t ret_value;
@@ -8232,8 +8232,8 @@ error:
/* Failure callback for when the link is moved or renamed */
static herr_t
-UD_cbfail_move(const char UNUSED *new_name, hid_t UNUSED new_loc,
- const void UNUSED *udata, size_t UNUSED udata_size)
+UD_cbfail_move(const char H5_ATTR_UNUSED *new_name, hid_t H5_ATTR_UNUSED new_loc,
+ const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size)
{
/* This traversal function will always fail. */
return -1;
@@ -8241,8 +8241,8 @@ UD_cbfail_move(const char UNUSED *new_name, hid_t UNUSED new_loc,
/* SuccessCallback for when the link is moved or renamed */
static herr_t
-UD_cbsucc_move(const char UNUSED *new_name, hid_t UNUSED new_loc,
- const void UNUSED *udata, size_t UNUSED udata_size)
+UD_cbsucc_move(const char H5_ATTR_UNUSED *new_name, hid_t H5_ATTR_UNUSED new_loc,
+ const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size)
{
/* This traversal function will always succeed. */
return 0;
@@ -8250,8 +8250,8 @@ UD_cbsucc_move(const char UNUSED *new_name, hid_t UNUSED new_loc,
/* Callback for when the link is deleted. Also called during move */
static herr_t
-UD_cbsucc_delete(const char UNUSED *link_name, hid_t UNUSED file,
- const void UNUSED *udata, size_t UNUSED udata_size)
+UD_cbsucc_delete(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED file,
+ const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size)
{
/* This callback will always succeed */
return 0;
@@ -8259,8 +8259,8 @@ UD_cbsucc_delete(const char UNUSED *link_name, hid_t UNUSED file,
/* Callback for when the link is deleted. Also called during move */
static herr_t
-UD_cbfail_delete(const char UNUSED *link_name, hid_t UNUSED file,
- const void UNUSED *udata, size_t UNUSED udata_size)
+UD_cbfail_delete(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED file,
+ const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size)
{
/* This traversal function will always fail. */
/* Note: un-deletable links are in general a very bad idea! */
@@ -8269,8 +8269,8 @@ UD_cbfail_delete(const char UNUSED *link_name, hid_t UNUSED file,
/* Callback for when the link is queried */
static ssize_t
-UD_cbfail_query(const char UNUSED *link_name, const void UNUSED *udata,
- size_t UNUSED udata_size, void UNUSED *buf, size_t UNUSED buf_size)
+UD_cbfail_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata,
+ size_t H5_ATTR_UNUSED udata_size, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNUSED buf_size)
{
/* This traversal function will always fail. */
return -1;
@@ -8278,8 +8278,8 @@ UD_cbfail_query(const char UNUSED *link_name, const void UNUSED *udata,
/* Callback for when the link is queried */
static ssize_t
-UD_cbfail_on_write_query(const char UNUSED *link_name, const void UNUSED *udata,
- size_t UNUSED udata_size, void *buf, size_t UNUSED buf_size)
+UD_cbfail_on_write_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata,
+ size_t H5_ATTR_UNUSED udata_size, void *buf, size_t H5_ATTR_UNUSED buf_size)
{
/* This traversal function will return a buffer size,
* but will fail when a buffer is passed in ("writing to the buffer"
@@ -8294,8 +8294,8 @@ UD_cbfail_on_write_query(const char UNUSED *link_name, const void UNUSED *udata,
/* Callback for when the link is queried */
static ssize_t
-UD_cbsucc_query(const char UNUSED *link_name, const void UNUSED *udata,
- size_t UNUSED udata_size, void *buf, size_t buf_size)
+UD_cbsucc_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata,
+ size_t H5_ATTR_UNUSED udata_size, void *buf, size_t buf_size)
{
/* This traversal function will return a buffer size,
* but will fail when a buffer is passed in ("writing to the buffer"
@@ -9007,7 +9007,7 @@ error:
*-------------------------------------------------------------------------
*/
static int
-visit_link_cb(hid_t UNUSED group_id, const char *name, const H5L_info_t *linfo,
+visit_link_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5L_info_t *linfo,
void *_op_data)
{
lvisit_ud_t *op_data = (lvisit_ud_t *)_op_data;
@@ -9185,7 +9185,7 @@ error:
*-------------------------------------------------------------------------
*/
static int
-visit_obj_cb(hid_t UNUSED group_id, const char *name, const H5O_info_t *oinfo,
+visit_obj_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5O_info_t *oinfo,
void *_op_data)
{
ovisit_ud_t *op_data = (ovisit_ud_t *)_op_data;
@@ -9363,7 +9363,7 @@ error:
*-------------------------------------------------------------------------
*/
static int
-visit_obj_stop_cb(hid_t UNUSED group_id, const char UNUSED *name, const H5O_info_t UNUSED *oinfo,
+visit_obj_stop_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *name, const H5O_info_t H5_ATTR_UNUSED *oinfo,
void *_op_data)
{
unsigned *op_data = (unsigned *)_op_data;
@@ -9489,8 +9489,8 @@ static herr_t link_filter_set_local(hid_t dcpl_id, hid_t type_id, hid_t space_id
} /* end link_filter_set_local */
static size_t link_filter_filter(unsigned int flags, size_t cd_nelmts,
- const unsigned int cd_values[], size_t nbytes, size_t UNUSED *buf_size,
- void UNUSED **buf)
+ const unsigned int cd_values[], size_t nbytes, size_t H5_ATTR_UNUSED *buf_size,
+ void H5_ATTR_UNUSED **buf)
{
if(flags & H5Z_FLAG_OPTIONAL || cd_nelmts != 1 || cd_values[0] != 2112)
return 0;
@@ -11990,8 +11990,8 @@ group_iterate_cb(hid_t group_id, const char *link_name, void *_op_data)
*-------------------------------------------------------------------------
*/
static int
-link_iterate_fail_cb(hid_t UNUSED group_id, const char UNUSED *link_name,
- const H5L_info_t UNUSED *info, void UNUSED *_op_data)
+link_iterate_fail_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *link_name,
+ const H5L_info_t H5_ATTR_UNUSED *info, void H5_ATTR_UNUSED *_op_data)
{
return(H5_ITER_ERROR);
} /* end link_iterate_fail_cb() */
diff --git a/test/objcopy.c b/test/objcopy.c
index 71a7236..e84e70c 100644
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -11449,7 +11449,7 @@ error:
*/
static herr_t
test_copy_iterate_cb(hid_t loc_id, const char *name,
- const H5L_info_t UNUSED *link_info, void *op_data)
+ const H5L_info_t H5_ATTR_UNUSED *link_info, void *op_data)
{
hid_t dst_loc_id = *((hid_t *)op_data);
diff --git a/test/tarray.c b/test/tarray.c
index 0923625..9c79f41 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -685,7 +685,7 @@ test_array_compound_atomic(void)
TestErrPrintf("Array data information doesn't match!, wdata[%d][%d].i=%d, rdata[%d][%d].i=%d\n", (int)i, (int)j, (int)wdata[i][j].i, (int)i, (int)j, (int)rdata[i][j].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(wdata[i][j].f, rdata[i][j].f)) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i][j].f, rdata[i][j].f)) {
TestErrPrintf("Array data information doesn't match!, wdata[%d][%d].f=%f, rdata[%d][%d].f=%f\n", (int)i, (int)j, (double)wdata[i][j].f, (int)i, (int)j, (double)rdata[i][j].f);
continue;
} /* end if */
@@ -928,7 +928,7 @@ test_array_compound_array(void)
continue;
} /* end if */
for(k=0; k<ARRAY1_DIM1; k++)
- if(!FLT_ABS_EQUAL(wdata[i][j].f[k],rdata[i][j].f[k])) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i][j].f[k],rdata[i][j].f[k])) {
TestErrPrintf("Array data information doesn't match!, wdata[%d][%d].f[%d]=%f, rdata[%d][%d].f[%d]=%f\n",(int)i,(int)j,(int)k,(double)wdata[i][j].f[k],(int)i,(int)j,(int)k,(double)rdata[i][j].f[k]);
continue;
} /* end if */
@@ -1618,11 +1618,11 @@ test_array_bkg(void)
TestErrPrintf("Field a data doesn't match, cf[%d].a[%d]=%d, cfr[%d].a[%d]=%d\n",(int)i,(int)j,(int)cf[i].a[j],(int)i,(int)j,(int)cfr[i].a[j]);
continue;
}
- if(!FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
+ if(!H5_FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
TestErrPrintf("Field b data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].b[j],(int)i,(int)j,(double)cfr[i].b[j]);
continue;
}
- if(!DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
+ if(!H5_DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
TestErrPrintf("Field c data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].c[j],(int)i,(int)j,(double)cfr[i].c[j]);
continue;
}
@@ -1685,7 +1685,7 @@ test_array_bkg(void)
for (i=0; i< LENGTH; i++)
for (j = 0; j < ALEN; j++)
- if(!FLT_ABS_EQUAL(fld[i].b[j],fldr[i].b[j])) {
+ if(!H5_FLT_ABS_EQUAL(fld[i].b[j],fldr[i].b[j])) {
TestErrPrintf("Field data doesn't match, fld[%d].b[%d]=%f, fldr[%d].b[%d]=%f\n",(int)i,(int)j,(double)fld[i].b[j],(int)i,(int)j,(double)fldr[i].b[j]);
continue;
}
@@ -1711,11 +1711,11 @@ test_array_bkg(void)
TestErrPrintf("Field a data doesn't match, cf[%d].a[%d]=%d, cfr[%d].a[%d]=%d\n",(int)i,(int)j,(int)cf[i].a[j],(int)i,(int)j,(int)cfr[i].a[j]);
continue;
}
- if(!FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
+ if(!H5_FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
TestErrPrintf("Field b data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].b[j],(int)i,(int)j,(double)cfr[i].b[j]);
continue;
}
- if(!DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
+ if(!H5_DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
TestErrPrintf("Field c data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].c[j],(int)i,(int)j,(double)cfr[i].c[j]);
continue;
}
@@ -1760,11 +1760,11 @@ test_array_bkg(void)
TestErrPrintf("Field a data doesn't match, cf[%d].a[%d]=%d, cfr[%d].a[%d]=%d\n",(int)i,(int)j,(int)cf[i].a[j],(int)i,(int)j,(int)cfr[i].a[j]);
continue;
}
- if(!FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
+ if(!H5_FLT_ABS_EQUAL(cf[i].b[j],cfr[i].b[j])) {
TestErrPrintf("Field b data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].b[j],(int)i,(int)j,(double)cfr[i].b[j]);
continue;
}
- if(!DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
+ if(!H5_DBL_ABS_EQUAL(cf[i].c[j],cfr[i].c[j])) {
TestErrPrintf("Field c data doesn't match, cf[%d].b[%d]=%f, cfr[%d].b[%d]=%f\n",(int)i,(int)j,(double)cf[i].c[j],(int)i,(int)j,(double)cfr[i].c[j]);
continue;
}
diff --git a/test/tattr.c b/test/tattr.c
index 31a3844..137c7c9 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -522,7 +522,7 @@ test_attr_flush(hid_t fapl)
ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
CHECK(ret, FAIL, "H5Awrite");
- if(!DBL_ABS_EQUAL(rdata,0.0F))
+ if(!H5_DBL_ABS_EQUAL(rdata,0.0F))
TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
ret=H5Fflush(fil, H5F_SCOPE_GLOBAL);
@@ -531,7 +531,7 @@ test_attr_flush(hid_t fapl)
ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
CHECK(ret, FAIL, "H5Awrite");
- if(!DBL_ABS_EQUAL(rdata,0.0F))
+ if(!H5_DBL_ABS_EQUAL(rdata,0.0F))
TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
ret=H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata);
@@ -540,7 +540,7 @@ test_attr_flush(hid_t fapl)
ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
CHECK(ret, FAIL, "H5Awrite");
- if(!DBL_ABS_EQUAL(rdata,wdata))
+ if(!H5_DBL_ABS_EQUAL(rdata,wdata))
TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,wdata);
ret=H5Sclose(spc);
@@ -1014,7 +1014,7 @@ test_attr_scalar_read(hid_t fapl)
CHECK(ret, FAIL, "H5Aread");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(rdata, attr_data5))
+ if(!H5_FLT_ABS_EQUAL(rdata, attr_data5))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Aread", (double)attr_data5, (double)rdata, (int)__LINE__, __FILE__);
@@ -1355,7 +1355,7 @@ test_attr_mult_read(hid_t fapl)
for(i = 0; i < ATTR3_DIM1; i++)
for(j = 0; j < ATTR3_DIM2; j++)
for(k = 0; k < ATTR3_DIM3; k++)
- if(!DBL_ABS_EQUAL(attr_data3[i][j][k], read_data3[i][j][k]))
+ if(!H5_DBL_ABS_EQUAL(attr_data3[i][j][k], read_data3[i][j][k]))
TestErrPrintf("%d: attribute data different: attr_data3[%d][%d][%d]=%f, read_data3[%d][%d][%d]=%f\n", __LINE__, i, j, k, attr_data3[i][j][k], i, j, k, read_data3[i][j][k]);
/* Verify Name */
@@ -1392,7 +1392,7 @@ test_attr_mult_read(hid_t fapl)
**
****************************************************************/
static herr_t
-attr_op1(hid_t UNUSED loc_id, const char *name, const H5A_info_t UNUSED *ainfo,
+attr_op1(hid_t H5_ATTR_UNUSED loc_id, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo,
void *op_data)
{
int *count = (int *)op_data;
@@ -6508,8 +6508,8 @@ attr_iterate1_cb(hid_t loc_id, const char *attr_name, void *_op_data)
*-------------------------------------------------------------------------
*/
static int
-attr_iterate2_fail_cb(hid_t UNUSED group_id, const char UNUSED *attr_name,
- const H5A_info_t UNUSED *info, void UNUSED *_op_data)
+attr_iterate2_fail_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *attr_name,
+ const H5A_info_t H5_ATTR_UNUSED *info, void H5_ATTR_UNUSED *_op_data)
{
return(H5_ITER_ERROR);
} /* end attr_iterate2_fail_cb() */
diff --git a/test/tcheck_version.c b/test/tcheck_version.c
index 91d98ef..a75d642 100644
--- a/test/tcheck_version.c
+++ b/test/tcheck_version.c
@@ -36,7 +36,7 @@
/* prototypes */
void showhelp(void);
void parse(int ac, char **av);
-void abort_intercept (int UNUSED sig);
+void abort_intercept (int H5_ATTR_UNUSED sig);
/* global variables */
unsigned major = H5_VERS_MAJOR;
@@ -105,7 +105,7 @@ parse(int ac, char **av)
* This tries to eliminate those side effects.
*/
void
-abort_intercept (int UNUSED sig)
+abort_intercept (int H5_ATTR_UNUSED sig)
{
HDexit(6);
}
diff --git a/test/tgenprop.c b/test/tgenprop.c
index a3f1752..10cae6d 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -385,7 +385,7 @@ test_genprop_cls_crt_cb1(hid_t list_id, void *create_data)
}
static herr_t
-test_genprop_cls_cpy_cb1(hid_t new_list_id, hid_t UNUSED old_list_id, void *copy_data)
+test_genprop_cls_cpy_cb1(hid_t new_list_id, hid_t H5_ATTR_UNUSED old_list_id, void *copy_data)
{
struct { /* Struct for iterations */
int count;
@@ -681,7 +681,7 @@ test_genprop_basic_list(void)
ret = H5Pget(lid1, PROP2_NAME,&prop2_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
@@ -773,7 +773,7 @@ test_genprop_basic_list_prop(void)
ret = H5Pget(lid1, PROP2_NAME,&prop2_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
@@ -786,7 +786,7 @@ test_genprop_basic_list_prop(void)
ret = H5Pget(lid1, PROP4_NAME,&prop4_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
@@ -823,7 +823,7 @@ test_genprop_basic_list_prop(void)
ret = H5Pget(lid1, PROP4_NAME,&prop4_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
@@ -993,7 +993,7 @@ prop_cb_info prop3_cb_info; /* Callback statistics for property #3 */
**
****************************************************************/
static herr_t
-test_genprop_cls_cpy_cb2(hid_t new_list_id, hid_t UNUSED old_list_id, void *create_data)
+test_genprop_cls_cpy_cb2(hid_t new_list_id, hid_t H5_ATTR_UNUSED old_list_id, void *create_data)
{
struct { /* Struct for iterations */
int count;
@@ -1237,7 +1237,7 @@ test_genprop_list_callback(void)
ret = H5Pget(lid1, PROP2_NAME,&prop2_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop2_value,*PROP2_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", (double)*PROP2_DEF_VALUE, (double)prop2_value, (int)__LINE__, __FILE__);
@@ -1252,7 +1252,7 @@ test_genprop_list_callback(void)
ret = H5Pget(lid1, PROP4_NAME,&prop4_value);
CHECK_I(ret, "H5Pget");
/* Verify the floating-poing value in this way to avoid compiler warning. */
- if(!FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
+ if(!H5_FLT_ABS_EQUAL(prop4_value,*PROP4_DEF_VALUE))
printf("*** UNEXPECTED VALUE from %s should be %f, but is %f at line %4d in %s\n",
"H5Pget", *PROP4_DEF_VALUE, prop4_value, (int)__LINE__, __FILE__);
diff --git a/test/th5o.c b/test/th5o.c
index a470f4c..be3b4ab 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -669,7 +669,7 @@ test_h5o_plist(void)
gcpl = H5Gget_create_plist(grp);
CHECK(gcpl, FAIL, "H5Gget_create_plist");
tcpl = H5Tget_create_plist(dtype);
- CHECK(dcpl, FAIL, "H5Tget_create_plist");
+ CHECK(tcpl, FAIL, "H5Tget_create_plist");
dcpl = H5Dget_create_plist(dset);
CHECK(dcpl, FAIL, "H5Dget_create_plist");
@@ -719,7 +719,7 @@ test_h5o_plist(void)
gcpl = H5Gget_create_plist(grp);
CHECK(gcpl, FAIL, "H5Gget_create_plist");
tcpl = H5Tget_create_plist(dtype);
- CHECK(dcpl, FAIL, "H5Tget_create_plist");
+ CHECK(tcpl, FAIL, "H5Tget_create_plist");
dcpl = H5Dget_create_plist(dset);
CHECK(dcpl, FAIL, "H5Dget_create_plist");
diff --git a/test/th5s.c b/test/th5s.c
index 7c1c46e..1560ef4 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -1683,7 +1683,7 @@ test_h5s_chunk(void)
for(i=0; i<50000; i++) {
for(j=0; j<3; j++) {
/* Check if the two values are within 0.001% range. */
- if(!DBL_REL_EQUAL(chunk_data_dbl[i][j], chunk_data_flt[i][j], 0.00001F))
+ if(!H5_DBL_REL_EQUAL(chunk_data_dbl[i][j], chunk_data_flt[i][j], 0.00001F))
TestErrPrintf("%u: chunk_data_dbl[%d][%d]=%e, chunk_data_flt[%d][%d]=%e\n", (unsigned)__LINE__, i, j, chunk_data_dbl[i][j], i, j, (double)chunk_data_flt[i][j]);
} /* end for */
} /* end for */
diff --git a/test/tid.c b/test/tid.c
index 8c64b79..85d26c9 100644
--- a/test/tid.c
+++ b/test/tid.c
@@ -239,7 +239,7 @@ out:
/* A dummy search function for the next test */
-static int test_search_func(void UNUSED * ptr1, void UNUSED * ptr2) { return 0; }
+static int test_search_func(void H5_ATTR_UNUSED * ptr1, void H5_ATTR_UNUSED * ptr2) { return 0; }
/* Ensure that public functions cannot access "predefined" ID types */
static int id_predefined_test(void )
diff --git a/test/titerate.c b/test/titerate.c
index 049e258..fff13f1 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -83,7 +83,7 @@ int iter_strcmp(const void *s1, const void *s2)
**
****************************************************************/
static herr_t
-liter_cb(hid_t UNUSED group, const char *name, const H5L_info_t UNUSED *link_info,
+liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_info,
void *op_data)
{
iter_info *info = (iter_info *)op_data;
@@ -344,7 +344,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
**
****************************************************************/
herr_t
-aiter_cb(hid_t UNUSED group, const char *name, const H5A_info_t UNUSED *ainfo,
+aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo,
void *op_data)
{
iter_info *info = (iter_info *)op_data;
@@ -538,7 +538,7 @@ int iter_strcmp2(const void *s1, const void *s2)
**
****************************************************************/
static herr_t
-liter_cb2(hid_t loc_id, const char *name, const H5L_info_t UNUSED *link_info,
+liter_cb2(hid_t loc_id, const char *name, const H5L_info_t H5_ATTR_UNUSED *link_info,
void *opdata)
{
const iter_info *test_info = (const iter_info *)opdata;
diff --git a/test/tmisc.c b/test/tmisc.c
index 869557c..11c6de7 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -2486,7 +2486,7 @@ test_misc14(void)
/* Check data from first dataset */
ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata, data1))
+ if(!H5_DBL_ABS_EQUAL(rdata, data1))
TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
/* Unlink second dataset */
@@ -2500,7 +2500,7 @@ test_misc14(void)
/* Verify the data from dataset #1 */
ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data1))
+ if(!H5_DBL_ABS_EQUAL(rdata,data1))
TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
/* Close first dataset */
@@ -2534,7 +2534,7 @@ test_misc14(void)
/* Check data from second dataset */
ret = H5Dread(Dataset2, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data2))
+ if(!H5_DBL_ABS_EQUAL(rdata,data2))
TestErrPrintf("Error on line %d: data2!=rdata\n",__LINE__);
/* Unlink first dataset */
@@ -2548,7 +2548,7 @@ test_misc14(void)
/* Verify the data from dataset #2 */
ret = H5Dread(Dataset2, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data2))
+ if(!H5_DBL_ABS_EQUAL(rdata,data2))
TestErrPrintf("Error on line %d: data2!=rdata\n",__LINE__);
/* Close second dataset */
@@ -2589,13 +2589,13 @@ test_misc14(void)
/* Check data from first dataset */
ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data1))
+ if(!H5_DBL_ABS_EQUAL(rdata,data1))
TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
/* Check data from third dataset */
ret = H5Dread(Dataset3, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data3))
+ if(!H5_DBL_ABS_EQUAL(rdata,data3))
TestErrPrintf("Error on line %d: data3!=rdata\n",__LINE__);
/* Unlink second dataset */
@@ -2609,13 +2609,13 @@ test_misc14(void)
/* Verify the data from dataset #1 */
ret = H5Dread(Dataset1, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data1))
+ if(!H5_DBL_ABS_EQUAL(rdata,data1))
TestErrPrintf("Error on line %d: data1!=rdata\n",__LINE__);
/* Verify the data from dataset #3 */
ret = H5Dread(Dataset3, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
- if(!DBL_ABS_EQUAL(rdata,data3))
+ if(!H5_DBL_ABS_EQUAL(rdata,data3))
TestErrPrintf("Error on line %d: data3!=rdata\n",__LINE__);
/* Close first dataset */
@@ -5137,8 +5137,8 @@ test_misc29(void)
static int
-test_misc30_get_info_cb(hid_t loc_id, const char *name, const H5L_info_t UNUSED *info,
- void UNUSED *op_data)
+test_misc30_get_info_cb(hid_t loc_id, const char *name, const H5L_info_t H5_ATTR_UNUSED *info,
+ void H5_ATTR_UNUSED *op_data)
{
H5O_info_t object_info;
diff --git a/test/trefer.c b/test/trefer.c
index 6d72aee..203b602 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -1232,7 +1232,7 @@ test_reference_obj_deleted(void)
**
****************************************************************/
static herr_t
-test_deref_iter_op(hid_t UNUSED group, const char *name, const H5L_info_t UNUSED *info,
+test_deref_iter_op(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t H5_ATTR_UNUSED *info,
void *op_data)
{
int *count = (int *)op_data; /* Pointer to name counter */
diff --git a/test/tselect.c b/test/tselect.c
index b34d095..bdcdb2b 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -186,7 +186,7 @@ static herr_t test_select_hyper_iter3(void *elem,hid_t type_id, unsigned ndim, c
**
****************************************************************/
static herr_t
-test_select_hyper_iter1(void *_elem, hid_t UNUSED type_id, unsigned UNUSED ndim, const hsize_t UNUSED *point, void *_operator_data)
+test_select_hyper_iter1(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *_operator_data)
{
uint8_t *tbuf=(uint8_t *)_elem, /* temporary buffer pointer */
**tbuf2=(uint8_t **)_operator_data; /* temporary buffer handle */
@@ -385,7 +385,7 @@ struct pnt_iter {
**
****************************************************************/
static herr_t
-test_select_point_iter1(void *_elem, hid_t UNUSED type_id, unsigned UNUSED ndim, const hsize_t UNUSED *point, void *_operator_data)
+test_select_point_iter1(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *_operator_data)
{
uint8_t *elem=(uint8_t *)_elem; /* Pointer to the element to examine */
uint8_t *tmp; /* temporary ptr to element in operator data */
@@ -662,7 +662,7 @@ test_select_point(hid_t xfer_plist)
**
****************************************************************/
static herr_t
-test_select_all_iter1(void *_elem, hid_t UNUSED type_id, unsigned UNUSED ndim, const hsize_t UNUSED *point, void *_operator_data)
+test_select_all_iter1(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void *_operator_data)
{
uint8_t *tbuf=(uint8_t *)_elem, /* temporary buffer pointer */
**tbuf2=(uint8_t **)_operator_data; /* temporary buffer handle */
@@ -682,7 +682,7 @@ test_select_all_iter1(void *_elem, hid_t UNUSED type_id, unsigned UNUSED ndim, c
**
****************************************************************/
static herr_t
-test_select_none_iter1(void UNUSED *_elem, hid_t UNUSED type_id, unsigned UNUSED ndim, const hsize_t UNUSED *point, void UNUSED *_operator_data)
+test_select_none_iter1(void H5_ATTR_UNUSED *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t H5_ATTR_UNUSED *point, void H5_ATTR_UNUSED *_operator_data)
{
return(-1);
} /* end test_select_none_iter1() */
@@ -5816,7 +5816,7 @@ test_select_hyper_nota_2d(void)
**
****************************************************************/
static herr_t
-test_select_hyper_iter2(void *_elem, hid_t UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data)
+test_select_hyper_iter2(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data)
{
int *tbuf=(int *)_elem, /* temporary buffer pointer */
**tbuf2=(int **)_operator_data; /* temporary buffer handle */
@@ -7008,7 +7008,7 @@ typedef struct {
**
****************************************************************/
static herr_t
-test_select_hyper_iter3(void *_elem, hid_t UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data)
+test_select_hyper_iter3(void *_elem, hid_t H5_ATTR_UNUSED type_id, unsigned ndim, const hsize_t *point, void *_operator_data)
{
unsigned *tbuf = (unsigned *)_elem; /* temporary buffer pointer */
fill_iter_info *iter_info = (fill_iter_info *)_operator_data; /* Get the pointer to the iterator information */
diff --git a/test/tskiplist.c b/test/tskiplist.c
index 8966e39..07e63fd 100644
--- a/test/tskiplist.c
+++ b/test/tskiplist.c
@@ -592,7 +592,7 @@ test_skiplist_string(void)
} /* end test_skiplist_string() */
static herr_t
-test_skiplist_iter(void *item, void UNUSED *key, void *op_data)
+test_skiplist_iter(void *item, void H5_ATTR_UNUSED *key, void *op_data)
{
size_t *up=(size_t *)op_data;
@@ -1070,7 +1070,7 @@ test_skiplist_add(void)
} /* end test_skiplist_add() */
static herr_t
-test_skiplist_destroy_free(void *item, void UNUSED *key, void *op_data)
+test_skiplist_destroy_free(void *item, void H5_ATTR_UNUSED *key, void *op_data)
{
unsigned *free_count=(unsigned *)op_data;
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index d8ed462..9bbec34 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -120,7 +120,7 @@ void tts_cancel(void)
assert(ret==0);
}
-void *tts_cancel_thread(void UNUSED *arg)
+void *tts_cancel_thread(void H5_ATTR_UNUSED *arg)
{
int datavalue;
int buffer;
@@ -182,8 +182,8 @@ void *tts_cancel_thread(void UNUSED *arg)
return NULL;
}
-herr_t tts_cancel_callback(void *elem, hid_t UNUSED type_id, unsigned UNUSED ndim,
- const hsize_t UNUSED *point, void *operator_data)
+herr_t tts_cancel_callback(void *elem, hid_t H5_ATTR_UNUSED type_id, unsigned H5_ATTR_UNUSED ndim,
+ const hsize_t H5_ATTR_UNUSED *point, void *operator_data)
{
int value = *(int *)elem;
hid_t dataset = *(hid_t *)operator_data;
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c
index b81a7ad..e143263 100644
--- a/test/ttsafe_error.c
+++ b/test/ttsafe_error.c
@@ -154,7 +154,7 @@ void tts_error(void)
}
static
-void *tts_error_thread(void UNUSED *arg)
+void *tts_error_thread(void H5_ATTR_UNUSED *arg)
{
hid_t dataspace, datatype, dataset;
hsize_t dimsf[1]; /* dataset dimensions */
@@ -199,7 +199,7 @@ void *tts_error_thread(void UNUSED *arg)
}
static
-herr_t error_callback(hid_t UNUSED estack_id, void *client_data)
+herr_t error_callback(hid_t H5_ATTR_UNUSED estack_id, void *client_data)
{
H5TS_mutex_lock_simple(&error_mutex);
error_count++;
@@ -208,7 +208,7 @@ herr_t error_callback(hid_t UNUSED estack_id, void *client_data)
}
static
-herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void UNUSED *client_data)
+herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void H5_ATTR_UNUSED *client_data)
{
hid_t maj_num, min_num;
diff --git a/test/tunicode.c b/test/tunicode.c
index 82dc429..93c00c5 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -119,7 +119,7 @@ void test_fl_string(hid_t fid, const char *string)
* Borrows heavily from dtypes.c, but is more complicated because
* the string is randomly generated.
*/
-void test_strpad(hid_t UNUSED fid, const char *string)
+void test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string)
{
/* buf is used to hold the data that H5Tconvert operates on. */
char buf[LONG_BUF_SIZE];
@@ -650,7 +650,7 @@ void test_compound(hid_t fid, const char * string)
* test_enum
* Test that enumerated datatypes can have UTF-8 member names.
*/
-void test_enum(hid_t UNUSED fid, const char * string)
+void test_enum(hid_t H5_ATTR_UNUSED fid, const char * string)
{
/* Define an enumerated type */
typedef enum {
@@ -699,7 +699,7 @@ void test_enum(hid_t UNUSED fid, const char * string)
* test_opaque
* Test comments on opaque datatypes
*/
-void test_opaque(hid_t UNUSED fid, const char * string)
+void test_opaque(hid_t H5_ATTR_UNUSED fid, const char * string)
{
hid_t type_id;
char * read_buf;
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 19e8252..d1a4235 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -798,7 +798,7 @@ test_vltypes_vlen_compound(void)
TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].i=%d, rdata[%d].p[%d].i=%d\n",(int)i,(int)j, (int)((s1 *)wdata[i].p)[j].i, (int)i,(int)j, (int)((s1 *)rdata[i].p)[j].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
+ if(!H5_FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].f=%f, rdata[%d].p[%d].f=%f\n",(int)i,(int)j, (double)((s1 *)wdata[i].p)[j].f, (int)i,(int)j, (double)((s1 *)rdata[i].p)[j].f);
continue;
} /* end if */
@@ -943,7 +943,7 @@ rewrite_vltypes_vlen_compound(void)
TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].i=%d, rdata[%d].p[%d].i=%d\n",(int)i,(int)j, (int)((s1 *)wdata[i].p)[j].i, (int)i,(int)j, (int)((s1 *)rdata[i].p)[j].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
+ if(!H5_FLT_ABS_EQUAL(((s1 *)wdata[i].p)[j].f,((s1 *)rdata[i].p)[j].f)) {
TestErrPrintf("VL data values don't match!, wdata[%d].p[%d].f=%f, rdata[%d].p[%d].f=%f\n",(int)i,(int)j, (double)((s1 *)wdata[i].p)[j].f, (int)i,(int)j, (double)((s1 *)rdata[i].p)[j].f);
continue;
} /* end if */
@@ -1092,7 +1092,7 @@ test_vltypes_compound_vlen_vlen(void)
TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
continue;
} /* end if */
@@ -1546,7 +1546,7 @@ test_vltypes_compound_vlen_atomic(void)
TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
continue;
} /* end if */
@@ -1595,7 +1595,7 @@ test_vltypes_compound_vlen_atomic(void)
/* Check data read in */
for(i = 0; i < SPACE1_DIM1; i++)
- if(rdata[i].i != 0 || !FLT_ABS_EQUAL(rdata[i].f, 0.0F) || rdata[i].v.len != 0 || rdata[i].v.p != NULL)
+ if(rdata[i].i != 0 || !H5_FLT_ABS_EQUAL(rdata[i].f, 0.0F) || rdata[i].v.len != 0 || rdata[i].v.p != NULL)
TestErrPrintf("VL doesn't match!, rdata[%d].i=%d, rdata[%d].f=%f, rdata[%d].v.len=%u, rdata[%d].v.p=%p\n",(int)i,rdata[i].i,(int)i,(double)rdata[i].f,(int)i,(unsigned)rdata[i].v.len,(int)i,rdata[i].v.p);
/* Write dataset to disk */
@@ -1612,7 +1612,7 @@ test_vltypes_compound_vlen_atomic(void)
TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
continue;
} /* end if */
@@ -1764,7 +1764,7 @@ rewrite_vltypes_compound_vlen_atomic(void)
TestErrPrintf("Integer components don't match!, wdata[%d].i=%d, rdata[%d].i=%d\n",(int)i,(int)wdata[i].i,(int)i,(int)rdata[i].i);
continue;
} /* end if */
- if(!FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
+ if(!H5_FLT_ABS_EQUAL(wdata[i].f,rdata[i].f)) {
TestErrPrintf("Float components don't match!, wdata[%d].f=%f, rdata[%d].f=%f\n",(int)i,(double)wdata[i].f,(int)i,(double)rdata[i].f);
continue;
} /* end if */
diff --git a/test/unregister.c b/test/unregister.c
index 383958d..be40383 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -68,9 +68,9 @@ const H5Z_class2_t H5Z_DUMMY[1] = {{
*-------------------------------------------------------------------------
*/
static size_t
-filter_dummy(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
- const unsigned int UNUSED *cd_values, size_t nbytes,
- size_t UNUSED *buf_size, void UNUSED **buf)
+filter_dummy(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts,
+ const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes,
+ size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf)
{
return nbytes;
}