diff options
Diffstat (limited to 'test/cache_common.c')
| -rw-r--r-- | test/cache_common.c | 495 |
1 files changed, 247 insertions, 248 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index b406ff4..23fca65 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -20,7 +20,7 @@ #include "cache_common.h" -hbool_t pass = TRUE; /* set to false on error */ +bool pass = true; /* set to false on error */ const char *failure_mssg = NULL; static char tmp_msg_buf[256]; @@ -36,7 +36,7 @@ static test_entry_t *monster_entries = NULL, *orig_monster_entries = NULL; static test_entry_t *variable_entries = NULL, *orig_variable_entries = NULL; static test_entry_t *notify_entries = NULL, *orig_notify_entries = NULL; -hbool_t orig_entry_arrays_init = FALSE; +bool orig_entry_arrays_init = false; static herr_t pico_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr); static herr_t nano_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr); @@ -55,17 +55,17 @@ static herr_t variable_get_final_load_size(const void *image, size_t image_len, static htri_t variable_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr); -static void *pico_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *nano_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *micro_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *tiny_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *small_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *medium_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *large_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *huge_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *monster_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *variable_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); -static void *notify_deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr); +static void *pico_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *nano_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *micro_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *tiny_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *small_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *medium_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *large_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *huge_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *monster_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *variable_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); +static void *notify_deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr); static herr_t pico_image_len(const void *thing, size_t *image_len_ptr); static herr_t nano_image_len(const void *thing, size_t *image_len_ptr); @@ -135,7 +135,7 @@ static void mark_flush_dep_clean(test_entry_t *entry_ptr); static herr_t get_initial_load_size(void *udata_ptr, size_t *image_len_ptr, int32_t entry_type); static herr_t get_final_load_size(const void *image, size_t image_len, void *udata, size_t *actual_len, int32_t entry_type); -static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, hbool_t *dirty_ptr, +static void *deserialize(const void *image_ptr, size_t len, void *udata_ptr, bool *dirty_ptr, int32_t entry_type); static herr_t image_len(const void *thing, size_t *image_len_ptr, int32_t entry_type); static herr_t pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len, haddr_t *new_addr_ptr, @@ -599,8 +599,8 @@ variable_get_final_load_size(const void *image, size_t image_len, void *udata, s * --check is ok only after 'max_verify_ct' is reached * --otherwise check is not ok * - * Return: TRUE: checksum is ok - * FALSE: checksum is not ok + * Return: true: checksum is ok + * false: checksum is not ok * *------------------------------------------------------------------------- */ @@ -632,9 +632,9 @@ verify_chksum(const void H5_ATTR_UNUSED *image, size_t H5_ATTR_UNUSED len, void assert(entry->addr == addr); if (++entry->verify_ct >= entry->max_verify_ct) - return (TRUE); + return (true); else - return (FALSE); + return (false); } /* verify_chksum() */ @@ -656,7 +656,7 @@ variable_verify_chksum(const void *image, size_t len, void *udata) *------------------------------------------------------------------------- */ static void * -deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hbool_t *dirty, +deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, bool *dirty, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) { test_entry_t *entry; @@ -685,8 +685,8 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb assert(entry->flush_dep_npar == 0); assert(entry->flush_dep_nchd == 0); - /* for now *dirty will always be FALSE */ - *dirty = FALSE; + /* for now *dirty will always be false */ + *dirty = false; /* verify that the image contains the expected data. */ assert(image != NULL); @@ -715,76 +715,76 @@ deserialize(const void *image, size_t H5_ATTR_NDEBUG_UNUSED len, void *udata, hb } /* end else */ } /* end if */ - entry->deserialized = TRUE; - entry->header.is_dirty = FALSE; - entry->is_dirty = FALSE; + entry->deserialized = true; + entry->header.is_dirty = false; + entry->is_dirty = false; (entry->deserializes)++; return ((void *)entry); } /* deserialize() */ void * -pico_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +pico_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, PICO_ENTRY_TYPE); } void * -nano_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +nano_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, NANO_ENTRY_TYPE); } void * -micro_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +micro_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MICRO_ENTRY_TYPE); } void * -tiny_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +tiny_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, TINY_ENTRY_TYPE); } void * -small_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +small_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, SMALL_ENTRY_TYPE); } void * -medium_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +medium_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MEDIUM_ENTRY_TYPE); } void * -large_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +large_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, LARGE_ENTRY_TYPE); } void * -huge_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +huge_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, HUGE_ENTRY_TYPE); } void * -monster_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +monster_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, MONSTER_ENTRY_TYPE); } void * -variable_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +variable_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, VARIABLE_ENTRY_TYPE); } void * -notify_deserialize(const void *image, size_t len, void *udata, hbool_t *dirty) +notify_deserialize(const void *image, size_t len, void *udata, bool *dirty) { return deserialize(image, len, udata, dirty, NOTIFY_ENTRY_TYPE); } @@ -953,7 +953,7 @@ pre_serialize(H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *thing, haddr_t H5_ATTR_NDEBU execute_flush_op(entry->file_ptr, entry, &((entry->flush_ops)[i]), flags_ptr); } /* end for */ entry->num_flush_ops = 0; - entry->flush_op_self_resize_in_progress = FALSE; + entry->flush_op_self_resize_in_progress = false; /* This looks wrong, but it isn't -- *flags_ptr will be modified * by execute_flush_op() only if the target is this entry -- @@ -1122,7 +1122,7 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin * as close to that callback as we will get. Hence mark the entry * clean here. If all goes well, it will be flushed shortly. */ - entry->is_dirty = FALSE; + entry->is_dirty = false; if (entry->flush_dep_npar > 0) { assert(entry->flush_dep_ndirty_chd == 0); @@ -1133,13 +1133,13 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin * as initialized. */ if (entry->at_main_addr) - entry->written_to_main_addr = TRUE; + entry->written_to_main_addr = true; else - entry->written_to_alt_addr = TRUE; + entry->written_to_alt_addr = true; /* do book keeping */ (entry->serializes)++; - entry->serialized = TRUE; + entry->serialized = true; return (SUCCEED); } /* serialize() */ @@ -1345,7 +1345,7 @@ free_icr(test_entry_t *entry, int32_t H5_ATTR_NDEBUG_UNUSED entry_type) entry->num_pins = 0; } /* end if */ - entry->destroyed = TRUE; + entry->destroyed = true; entry->cache_ptr = NULL; return (SUCCEED); @@ -1426,7 +1426,7 @@ notify_free_icr(void *thing) /*------------------------------------------------------------------------- * Function: add_flush_op * - * Purpose: Do nothing if pass is FALSE on entry. + * Purpose: Do nothing if pass is false on entry. * * Otherwise, add the specified flush operation to the * target instance of test_entry_t. @@ -1437,7 +1437,7 @@ notify_free_icr(void *thing) */ void -add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hbool_t flag, size_t new_size, +add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, bool flag, size_t new_size, unsigned *order_ptr) { int i; @@ -1476,7 +1476,7 @@ add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hb /*------------------------------------------------------------------------- * Function: create_pinned_entry_dependency * - * Purpose: Do nothing if pass is FALSE on entry. + * Purpose: Do nothing if pass is false on entry. * * Otherwise, set up a pinned entry dependency so we can * test the pinned entry modifications to the flush routine. @@ -1558,7 +1558,7 @@ create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_id */ void -dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) +dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, bool dirty_pin) { test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -1576,7 +1576,7 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) if (!entry_in_cache(cache_ptr, type, idx)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be dirty pinned is not in cache."; } else { @@ -1590,7 +1590,7 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin) if (!((entry_ptr->header).is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be dirty pinned is not pinned."; } else { @@ -1667,7 +1667,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o (*flags_ptr) |= H5C__SERIALIZE_RESIZED_FLAG; - entry_ptr->flush_op_self_resize_in_progress = TRUE; + entry_ptr->flush_op_self_resize_in_progress = true; } else { @@ -1690,12 +1690,12 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o if (op_ptr->flag) { assert(entry_ptr->addr == entry_ptr->alt_addr); entry_ptr->addr = entry_ptr->main_addr; - entry_ptr->at_main_addr = TRUE; + entry_ptr->at_main_addr = true; } /* end if */ else { assert(entry_ptr->addr == entry_ptr->main_addr); entry_ptr->addr = entry_ptr->alt_addr; - entry_ptr->at_main_addr = FALSE; + entry_ptr->at_main_addr = false; } /* end else */ } /* end if */ else @@ -1733,7 +1733,7 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o break; default: - pass = FALSE; + pass = false; failure_mssg = "Undefined flush op code."; break; } @@ -1747,15 +1747,15 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o * Purpose: Given a pointer to a cache, an entry type, and an index, * determine if the entry is currently in the cache. * - * Return: TRUE if the entry is in the cache, and FALSE otherwise. + * Return: true if the entry is in the cache, and false otherwise. * *------------------------------------------------------------------------- */ -hbool_t +bool entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) { - hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ + bool in_cache = false; /* will set to true if necessary */ test_entry_t *base_addr; test_entry_t *entry_ptr; H5C_cache_entry_t *test_ptr = NULL; @@ -1775,7 +1775,7 @@ entry_in_cache(H5C_t *cache_ptr, int32_t type, int32_t idx) if (test_ptr != NULL) { - in_cache = TRUE; + in_cache = true; assert(test_ptr == (H5C_cache_entry_t *)entry_ptr); assert(entry_ptr->addr == entry_ptr->header.addr); } @@ -2003,10 +2003,10 @@ reset_entries(void) base_addr[j].header.addr = (haddr_t)0; base_addr[j].header.size = (size_t)0; base_addr[j].header.type = NULL; - base_addr[j].header.is_dirty = FALSE; - base_addr[j].header.is_protected = FALSE; - base_addr[j].header.is_read_only = FALSE; - base_addr[j].header.ro_ref_count = FALSE; + base_addr[j].header.is_dirty = false; + base_addr[j].header.is_protected = false; + base_addr[j].header.is_read_only = false; + base_addr[j].header.ro_ref_count = false; base_addr[j].header.next = NULL; base_addr[j].header.prev = NULL; #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS @@ -2016,10 +2016,10 @@ reset_entries(void) base_addr[j].self = &(base_addr[j]); base_addr[j].cache_ptr = NULL; - base_addr[j].written_to_main_addr = FALSE; - base_addr[j].written_to_alt_addr = FALSE; + base_addr[j].written_to_main_addr = false; + base_addr[j].written_to_alt_addr = false; base_addr[j].addr = addr; - base_addr[j].at_main_addr = TRUE; + base_addr[j].at_main_addr = true; base_addr[j].main_addr = addr; base_addr[j].alt_addr = alt_addr; base_addr[j].size = entry_size; @@ -2027,14 +2027,14 @@ reset_entries(void) base_addr[j].index = j; base_addr[j].serializes = 0; base_addr[j].deserializes = 0; - base_addr[j].is_dirty = FALSE; - base_addr[j].is_protected = FALSE; - base_addr[j].is_read_only = FALSE; - base_addr[j].ro_ref_count = FALSE; + base_addr[j].is_dirty = false; + base_addr[j].is_protected = false; + base_addr[j].is_read_only = false; + base_addr[j].ro_ref_count = false; - base_addr[j].is_corked = FALSE; + base_addr[j].is_corked = false; - base_addr[j].is_pinned = FALSE; + base_addr[j].is_pinned = false; base_addr[j].pinning_ref_count = 0; base_addr[j].num_pins = 0; for (k = 0; k < MAX_PINS; k++) { @@ -2047,21 +2047,21 @@ reset_entries(void) base_addr[j].flush_ops[k].op_code = FLUSH_OP__NO_OP; base_addr[j].flush_ops[k].type = -1; base_addr[j].flush_ops[k].idx = -1; - base_addr[j].flush_ops[k].flag = FALSE; + base_addr[j].flush_ops[k].flag = false; base_addr[j].flush_ops[k].size = 0; } - base_addr[j].flush_op_self_resize_in_progress = FALSE; + base_addr[j].flush_op_self_resize_in_progress = false; - base_addr[j].deserialized = FALSE; - base_addr[j].serialized = FALSE; - base_addr[j].destroyed = FALSE; - base_addr[j].expunged = FALSE; + base_addr[j].deserialized = false; + base_addr[j].serialized = false; + base_addr[j].destroyed = false; + base_addr[j].expunged = false; base_addr[j].flush_dep_npar = 0; base_addr[j].flush_dep_nchd = 0; base_addr[j].flush_dep_ndirty_chd = 0; - base_addr[j].pinned_from_client = FALSE; - base_addr[j].pinned_from_cache = FALSE; + base_addr[j].pinned_from_client = false; + base_addr[j].pinned_from_cache = false; base_addr[j].flush_order = 0; @@ -2081,7 +2081,7 @@ reset_entries(void) } /* end for */ /* Indicate that we've made a copy for later */ - orig_entry_arrays_init = TRUE; + orig_entry_arrays_init = true; } /* end if */ else { for (i = 0; i < NUMBER_OF_ENTRY_TYPES; i++) { @@ -2113,7 +2113,7 @@ reset_entries(void) */ void -resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_t in_cache) +resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, bool in_cache) { test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -2133,7 +2133,7 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ if (!entry_in_cache(cache_ptr, type, idx)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be resized pinned is not in cache."; } else { @@ -2148,23 +2148,23 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ if (!(entry_ptr->header.is_pinned || entry_ptr->header.is_protected)) { - pass = FALSE; + pass = false; failure_mssg = "entry to be resized is not pinned or protected."; } else { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; entry_ptr->size = new_size; result = H5C_resize_entry((void *)entry_ptr, new_size); - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); if (result != SUCCEED) { - pass = FALSE; + pass = false; failure_mssg = "error(s) in H5C_resize_entry()."; } else { @@ -2177,7 +2177,7 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ else { protect_entry(file_ptr, type, idx); - resize_entry(file_ptr, type, idx, new_size, TRUE); + resize_entry(file_ptr, type, idx, new_size, true); unprotect_entry(file_ptr, type, idx, H5C__DIRTIED_FLAG); } } @@ -2188,9 +2188,9 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_ * Function: verify_clean * * Purpose: Verify that all cache entries are marked as clean. If any - * are not, set pass to FALSE. + * are not, set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2225,7 +2225,7 @@ verify_clean(void) if (dirty_count > 0) { - pass = FALSE; + pass = false; failure_mssg = "verify_clean() found dirty entry(s)."; } } @@ -2237,9 +2237,9 @@ verify_clean(void) * * Purpose: Verify that a list of entries have the expected status. * If any discrepancies are found, set the failure message - * and set pass to FALSE. + * and set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2255,19 +2255,19 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ while ((pass) && (i < num_entries)) { test_entry_t *base_addr = entries[expected[i].entry_type]; test_entry_t *entry_ptr = &(base_addr[expected[i].entry_index]); - hbool_t in_cache = FALSE; /* will set to TRUE if necessary */ + bool in_cache = false; /* will set to true if necessary */ unsigned u; /* Local index variable */ if ((!expected[i].in_cache) && ((expected[i].is_protected) || (expected[i].is_pinned))) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d: Contradictory data in expected[%d].\n", tag, i); failure_mssg = tmp_msg_buf; } if ((!expected[i].in_cache) && (expected[i].is_dirty) && (!entry_ptr->expunged)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d: expected[%d] specs non-expunged, dirty, non-resident.\n", tag, i); failure_mssg = tmp_msg_buf; @@ -2279,7 +2279,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (in_cache != expected[i].in_cache) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) in cache actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, (int)in_cache, @@ -2292,7 +2292,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->size != expected[i].size) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) size actual/expected = %ld/%ld.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, (long)(entry_ptr->size), @@ -2305,7 +2305,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.size != expected[i].size) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header size actual/expected = %ld/%ld.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2318,7 +2318,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->at_main_addr != expected[i].at_main_addr) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) at main addr actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2331,7 +2331,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_dirty != expected[i].is_dirty) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_dirty actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2344,7 +2344,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_dirty != expected[i].is_dirty) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_dirty actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2357,7 +2357,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_protected != expected[i].is_protected) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_protected actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2370,7 +2370,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_protected != expected[i].is_protected) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_protected actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2383,7 +2383,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_pinned != expected[i].is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_pinned actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2396,7 +2396,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->is_corked != expected[i].is_corked) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) is_corked actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2409,7 +2409,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (entry_ptr->header.is_pinned != expected[i].is_pinned) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header is_pinned actual/expected = %d/%d.\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2424,7 +2424,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ (entry_ptr->serialized != expected[i].serialized) || (entry_ptr->destroyed != expected[i].destroyed)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d,%d) deserialized = %d(%d), serialized = %d(%d), dest = %d(%d)\n", tag, (int)expected[i].entry_type, (int)expected[i].entry_index, @@ -2440,7 +2440,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* # of flush dependency parents */ if (pass) { if (entry_ptr->flush_dep_npar != expected[i].flush_dep_npar) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_npar actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_npar, @@ -2450,7 +2450,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_nparents != expected[i].flush_dep_npar) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_nparents actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2464,7 +2464,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { for (u = 0; u < entry_ptr->flush_dep_npar; u++) { if (entry_ptr->flush_dep_par_type[u] != expected[i].flush_dep_par_type[u]) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_par_type[%u] actual/expected = %d/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, u, @@ -2476,7 +2476,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ if (pass) { for (u = 0; u < entry_ptr->flush_dep_npar; u++) { if (entry_ptr->flush_dep_par_idx[u] != expected[i].flush_dep_par_idx[u]) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_par_idx[%u] actual/expected = %d/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, u, @@ -2489,7 +2489,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* # of flush dependency children and dirty children */ if (pass) { if (entry_ptr->flush_dep_nchd != expected[i].flush_dep_nchd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_nchd actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_nchd, @@ -2499,7 +2499,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_nchildren != expected[i].flush_dep_nchd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_nchildren actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2509,7 +2509,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if (pass) { if (entry_ptr->flush_dep_ndirty_chd != expected[i].flush_dep_ndirty_chd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_dep_ndirty_chd actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_dep_ndirty_chd, @@ -2519,7 +2519,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ } /* end if */ if ((pass) && (in_cache)) { if (entry_ptr->header.flush_dep_ndirty_children != expected[i].flush_dep_ndirty_chd) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) header flush_dep_ndirty_children actual/expected = %u/%u.\n", tag, expected[i].entry_type, expected[i].entry_index, @@ -2531,7 +2531,7 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ /* Flush dependency flush order */ if (pass) { if (expected[i].flush_order >= 0 && entry_ptr->flush_order != (unsigned)expected[i].flush_order) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "%d entry (%d, %d) flush_order actual/expected = %u/%d.\n", tag, expected[i].entry_type, expected[i].entry_index, entry_ptr->flush_order, @@ -2549,9 +2549,9 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_ * Function: verify_unprotected * * Purpose: Verify that no cache entries are marked as protected. If - * any are, set pass to FALSE. + * any are, set pass to false. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2588,7 +2588,7 @@ verify_unprotected(void) if (protected_count > 0) { - pass = FALSE; + pass = false; failure_mssg = "verify_unprotected() found protected entry(s)."; } } @@ -2639,12 +2639,12 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_expunge_entry()."; } else { - entry_ptr->expunged = TRUE; + entry_ptr->expunged = true; } } @@ -2662,9 +2662,9 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx) */ void -flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_t dump_detailed_stats) +flush_cache(H5F_t *file_ptr, bool destroy_entries, bool dump_stats, bool dump_detailed_stats) { - hbool_t verbose = FALSE; + bool verbose = false; verify_unprotected(); @@ -2699,7 +2699,7 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_ (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)); } - pass = FALSE; + pass = false; failure_mssg = "non zero index len/sizes after H5C_flush_cache() with invalidate."; } } @@ -2731,7 +2731,7 @@ cork_entry_type(H5F_t *file_ptr, int32_t type) baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__SET_CORK, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_cork()."; } /* end if */ } /* end if */ @@ -2763,7 +2763,7 @@ uncork_entry_type(H5F_t *file_ptr, int32_t type) baddrs = base_addrs[type]; if (H5C_cork(cache_ptr, baddrs, H5C__UNCORK, NULL) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_cork()."; } /* end if */ } /* end if */ @@ -2787,7 +2787,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { H5C_t *cache_ptr; herr_t result; - hbool_t insert_pinned; + bool insert_pinned; test_entry_t *base_addr; test_entry_t *entry_ptr; haddr_t baddrs; @@ -2811,9 +2811,9 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) assert(entry_ptr->flush_dep_npar == 0); assert(entry_ptr->flush_dep_nchd == 0); - insert_pinned = (hbool_t)((flags & H5C__PIN_ENTRY_FLAG) != 0); + insert_pinned = (bool)((flags & H5C__PIN_ENTRY_FLAG) != 0); - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; /* Set the base address of the entry type into the property list as tag */ /* Use to cork entries for the object */ @@ -2824,7 +2824,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) if ((result < 0) || (entry_ptr->header.is_protected) || (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_insert()."; #if 0 /* This is useful debugging code. Lets keep it around. */ @@ -2856,7 +2856,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) entry_ptr->pinned_from_client = insert_pinned; if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) - entry_ptr->is_corked = TRUE; + entry_ptr->is_corked = true; assert(entry_ptr->header.is_dirty); assert(((entry_ptr->header).type)->id == type); @@ -2869,7 +2869,7 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) * * Purpose: Mark the specified entry as dirty. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -2882,7 +2882,7 @@ mark_entry_dirty(int32_t type, int32_t idx) herr_t result; test_entry_t *base_addr; test_entry_t *entry_ptr; - hbool_t was_dirty; + bool was_dirty; if (pass) { @@ -2898,7 +2898,7 @@ mark_entry_dirty(int32_t type, int32_t idx) assert(entry_ptr->header.is_protected || entry_ptr->header.is_pinned); was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -2911,7 +2911,7 @@ mark_entry_dirty(int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_mark_entry_dirty()."; } @@ -2933,10 +2933,10 @@ mark_entry_dirty(int32_t type, int32_t idx) */ void -move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) +move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, bool main_addr) { herr_t result = 0; - hbool_t done = TRUE; /* will set to FALSE if we have work to do */ + bool done = true; /* will set to false if we have work to do */ haddr_t old_addr = HADDR_UNDEF; haddr_t new_addr = HADDR_UNDEF; test_entry_t *base_addr; @@ -2964,7 +2964,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) assert(entry_ptr->addr == entry_ptr->main_addr); - done = FALSE; + done = false; old_addr = entry_ptr->addr; new_addr = entry_ptr->alt_addr; } @@ -2974,15 +2974,15 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) assert(entry_ptr->addr == entry_ptr->alt_addr); - done = FALSE; + done = false; old_addr = entry_ptr->addr; new_addr = entry_ptr->main_addr; } if (!done) { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -2997,7 +2997,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) if ((result < 0) || ((!(entry_ptr->header.destroy_in_progress)) && (entry_ptr->header.addr != new_addr))) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_move_entry()."; } else { @@ -3020,7 +3020,7 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) * * Purpose: Protect the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3088,7 +3088,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->verify_ct, entry_ptr->max_verify_ct); H5Eprint2(H5E_DEFAULT, stdout); #endif - pass = FALSE; + pass = false; failure_mssg = "error in H5C_protect()."; } /* end if */ @@ -3098,12 +3098,12 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; - entry_ptr->is_protected = TRUE; + entry_ptr->is_protected = true; } /* end else */ if (entry_ptr->header.tag_info && entry_ptr->header.tag_info->corked) - entry_ptr->is_corked = TRUE; + entry_ptr->is_corked = true; assert(((entry_ptr->header).type)->id == type); } /* end if */ @@ -3116,7 +3116,7 @@ protect_entry(H5F_t *file_ptr, int32_t type, int32_t idx) * Purpose: Do a read only protect the entry indicated by the type * and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3155,7 +3155,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in read only H5C_protect()."; } else { @@ -3164,8 +3164,8 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) entry_ptr->cache_ptr = cache_ptr; entry_ptr->file_ptr = file_ptr; - entry_ptr->is_protected = TRUE; - entry_ptr->is_read_only = TRUE; + entry_ptr->is_protected = true; + entry_ptr->is_read_only = true; entry_ptr->ro_ref_count++; } @@ -3179,7 +3179,7 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx) * * Purpose: Pin the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3210,18 +3210,18 @@ pin_entry(int32_t type, int32_t idx) if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5C_pin_protected_entry() reports failure."; } else if (!(entry_ptr->header.is_pinned)) { - pass = FALSE; + pass = false; failure_mssg = "entry not pinned when it should be."; } else { - entry_ptr->pinned_from_client = TRUE; - entry_ptr->is_pinned = TRUE; + entry_ptr->pinned_from_client = true; + entry_ptr->is_pinned = true; } } /* end if */ @@ -3232,7 +3232,7 @@ pin_entry(int32_t type, int32_t idx) * * Purpose: Unpin the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3268,11 +3268,11 @@ unpin_entry(int32_t type, int32_t idx) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_unpin()."; } - entry_ptr->pinned_from_client = FALSE; + entry_ptr->pinned_from_client = false; entry_ptr->is_pinned = entry_ptr->pinned_from_cache; @@ -3286,7 +3286,7 @@ unpin_entry(int32_t type, int32_t idx) * * Purpose: Unprotect the entry indicated by the type and index. * - * Do nothing if pass is FALSE on entry. + * Do nothing if pass is false on entry. * * Return: void * @@ -3297,8 +3297,8 @@ void unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) { herr_t result; - hbool_t pin_flag_set; - hbool_t unpin_flag_set; + bool pin_flag_set; + bool unpin_flag_set; test_entry_t *base_addr; test_entry_t *entry_ptr; @@ -3315,17 +3315,17 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) assert(entry_ptr->header.is_protected); assert(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 = (bool)((flags & H5C__PIN_ENTRY_FLAG) != 0); + unpin_flag_set = (bool)((flags & H5C__UNPIN_ENTRY_FLAG) != 0); assert(!(pin_flag_set && unpin_flag_set)); assert((!pin_flag_set) || (!(entry_ptr->is_pinned))); assert((!unpin_flag_set) || (entry_ptr->is_pinned)); if (flags & H5C__DIRTIED_FLAG) { - hbool_t was_dirty = entry_ptr->is_dirty; + bool was_dirty = entry_ptr->is_dirty; - entry_ptr->is_dirty = TRUE; + entry_ptr->is_dirty = true; if (entry_ptr->flush_dep_npar > 0 && !was_dirty) mark_flush_dep_dirty(entry_ptr); @@ -3339,7 +3339,7 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) (entry_ptr->header.type != types[type]) || (entry_ptr->size != entry_ptr->header.size) || (entry_ptr->addr != entry_ptr->header.addr)) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_unprotect()."; } else { @@ -3349,25 +3349,25 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) } else if (entry_ptr->ro_ref_count == 1) { - entry_ptr->is_protected = FALSE; - entry_ptr->is_read_only = FALSE; + entry_ptr->is_protected = false; + entry_ptr->is_read_only = false; entry_ptr->ro_ref_count = 0; } else { - entry_ptr->is_protected = FALSE; + entry_ptr->is_protected = false; } if (pin_flag_set) { assert(entry_ptr->header.is_pinned); - entry_ptr->pinned_from_client = TRUE; - entry_ptr->is_pinned = TRUE; + entry_ptr->pinned_from_client = true; + entry_ptr->is_pinned = true; } else if (unpin_flag_set) { assert(entry_ptr->header.is_pinned == entry_ptr->header.pinned_from_cache); - entry_ptr->pinned_from_client = FALSE; + entry_ptr->pinned_from_client = false; entry_ptr->is_pinned = entry_ptr->pinned_from_cache; } } @@ -3399,10 +3399,10 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags) *------------------------------------------------------------------------- */ void -row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) +row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, bool do_moves, + bool move_to_main_addr, bool do_destroys, bool do_mult_ro_protects, int dirty_destroys, + int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -3719,8 +3719,8 @@ row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) +hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -3808,10 +3808,10 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h */ void -row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - hbool_t do_moves, hbool_t move_to_main_addr, hbool_t do_destroys, - hbool_t do_mult_ro_protects, int dirty_destroys, int dirty_unprotects) +row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, bool do_moves, + bool move_to_main_addr, bool do_destroys, bool do_mult_ro_protects, + int dirty_destroys, int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; @@ -4065,8 +4065,8 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts) +hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts) { H5C_t *cache_ptr = NULL; int32_t type = NUMBER_OF_ENTRY_TYPES - 1; @@ -4154,9 +4154,8 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, */ void -col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, - int dirty_unprotects) +col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; int32_t type = 0; @@ -4243,8 +4242,8 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4343,8 +4342,8 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h */ void -col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4444,8 +4443,8 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t */ void -hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, hbool_t reset_stats, - hbool_t display_stats, hbool_t display_detailed_stats, hbool_t do_inserts, +hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, bool verbose, bool reset_stats, + bool display_stats, bool display_detailed_stats, bool do_inserts, int dirty_unprotects) { H5C_t *cache_ptr = NULL; @@ -4556,7 +4555,7 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int test_entry_t *par_entry_ptr; /* Parent entry */ test_entry_t *chd_base_addr; /* Base entry of child's entry array */ test_entry_t *chd_entry_ptr; /* Child entry */ - hbool_t par_is_pinned; /* Whether parent is already pinned */ + bool par_is_pinned; /* Whether parent is already pinned */ herr_t result; /* API routine status */ /* Get parent entry */ @@ -4584,7 +4583,7 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int if ((result < 0) || (!par_entry_ptr->header.is_pinned) || (!(par_entry_ptr->header.flush_dep_nchildren > 0))) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_create_flush_dependency()."; } /* end if */ @@ -4598,9 +4597,9 @@ create_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, int assert(par_entry_ptr->flush_dep_ndirty_chd < par_entry_ptr->flush_dep_nchd); par_entry_ptr->flush_dep_ndirty_chd++; } /* end if */ - par_entry_ptr->pinned_from_cache = TRUE; + par_entry_ptr->pinned_from_cache = true; if (!par_is_pinned) - par_entry_ptr->is_pinned = TRUE; + par_entry_ptr->is_pinned = true; } /* end if */ } /* create_flush_dependency() */ @@ -4652,7 +4651,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in assert(chd_entry_ptr == chd_entry_ptr->self); if (H5C_destroy_flush_dependency(par_entry_ptr, chd_entry_ptr) < 0) { - pass = FALSE; + pass = false; failure_mssg = "error in H5C_destroy_flush_dependency()."; } /* end if */ @@ -4671,7 +4670,7 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in chd_entry_ptr->flush_dep_npar--; par_entry_ptr->flush_dep_nchd--; if (par_entry_ptr->flush_dep_nchd == 0) { - par_entry_ptr->pinned_from_cache = FALSE; + par_entry_ptr->pinned_from_cache = false; par_entry_ptr->is_pinned = par_entry_ptr->pinned_from_client; } /* end if */ if (chd_entry_ptr->is_dirty || chd_entry_ptr->flush_dep_ndirty_chd > 0) { @@ -4771,13 +4770,13 @@ mark_flush_dep_clean(test_entry_t *entry_ptr) * * If the number of cache accesses exceeds the value provided * in the min_accesses parameter, and the hit rate is less than - * min_hit_rate, set pass to FALSE, and set failure_mssg to + * min_hit_rate, set pass to false, and set failure_mssg to * a string indicating that hit rate was unexpectedly low. * * Return hit rate in *hit_rate_ptr, and print the data to * stdout if requested. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to an appropriate value. * * Return: void @@ -4786,8 +4785,8 @@ mark_flush_dep_clean(test_entry_t *entry_ptr) */ void -check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t dump_data, - int64_t min_accesses, double min_hit_rate) +check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, bool dump_data, int64_t min_accesses, + double min_hit_rate) { herr_t result; int64_t cache_hits = 0; @@ -4804,14 +4803,14 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } else { cache_ptr = file_ptr->shared->cache; if (NULL == cache_ptr) { - pass = FALSE; + pass = false; failure_mssg = "NULL cache pointer"; } } @@ -4836,12 +4835,12 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_hit_rate() failed."; } else if (!H5_DBL_ABS_EQUAL(hit_rate, expected_hit_rate)) { - pass = FALSE; + pass = false; failure_mssg = "unexpected hit rate."; } } @@ -4852,7 +4851,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Freset_mdc_hit_rate_stats() failed."; } } @@ -4872,7 +4871,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d if ((pass) && (cache_accesses > min_accesses) && (hit_rate < min_hit_rate)) { - pass = FALSE; + pass = false; failure_mssg = "Unexpectedly low hit rate."; } @@ -4889,7 +4888,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d * parameters if these parameters are not NULL. Print the * data to stdout if requested. * - * If an error is detected, set pass to FALSE, and set + * If an error is detected, set pass to false, and set * failure_mssg to an appropriate value. * * Return: void @@ -4899,7 +4898,7 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d void check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr, - size_t *cur_size_ptr, int32_t *cur_num_entries_ptr, hbool_t dump_data) + size_t *cur_size_ptr, int32_t *cur_num_entries_ptr, bool dump_data) { herr_t result; size_t expected_max_size; @@ -4920,14 +4919,14 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c if (file_ptr == NULL) { - pass = FALSE; + pass = false; failure_mssg = "Can't get file_ptr."; } else { cache_ptr = file_ptr->shared->cache; if (NULL == cache_ptr) { - pass = FALSE; + pass = false; failure_mssg = "NULL cache pointer"; } } @@ -4945,13 +4944,13 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c if (result < 0) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() failed."; } else if ((max_size != expected_max_size) || (min_clean_size != expected_min_clean_size) || (cur_size != expected_cur_size) || (cur_num_entries != (int)expected_cur_num_entries)) { - pass = FALSE; + pass = false; failure_mssg = "H5Fget_mdc_size() returned unexpected value(s)."; } } @@ -4986,58 +4985,58 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c } /* check_and_validate_cache_size() */ -H5_ATTR_PURE hbool_t -resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, hbool_t compare_init) +H5_ATTR_PURE bool +resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t *b, bool compare_init) { if (a->version != b->version) - return (FALSE); + return (false); else if (a->rpt_fcn != b->rpt_fcn) - return (FALSE); + return (false); else if (compare_init && (a->set_initial_size != b->set_initial_size)) - return (FALSE); + return (false); else if (compare_init && (a->initial_size != b->initial_size)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->min_clean_fraction, b->min_clean_fraction)) - return (FALSE); + return (false); else if (a->max_size != b->max_size) - return (FALSE); + return (false); else if (a->min_size != b->min_size) - return (FALSE); + return (false); else if (a->epoch_length != b->epoch_length) - return (FALSE); + return (false); else if (a->incr_mode != b->incr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->lower_hr_threshold, b->lower_hr_threshold)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->increment, b->increment)) - return (FALSE); + return (false); else if (a->apply_max_increment != b->apply_max_increment) - return (FALSE); + return (false); else if (a->max_increment != b->max_increment) - return (FALSE); + return (false); else if (a->flash_incr_mode != b->flash_incr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->flash_multiple, b->flash_multiple)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->flash_threshold, b->flash_threshold)) - return (FALSE); + return (false); else if (a->decr_mode != b->decr_mode) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->upper_hr_threshold, b->upper_hr_threshold)) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->decrement, b->decrement)) - return (FALSE); + return (false); else if (a->apply_max_decrement != b->apply_max_decrement) - return (FALSE); + return (false); else if (a->max_decrement != b->max_decrement) - return (FALSE); + return (false); else if (a->epochs_before_eviction != b->epochs_before_eviction) - return (FALSE); + return (false); else if (a->apply_empty_reserve != b->apply_empty_reserve) - return (FALSE); + return (false); else if (!H5_DBL_ABS_EQUAL(a->empty_reserve, b->empty_reserve)) - return (FALSE); - return (TRUE); + return (false); + return (true); } /*------------------------------------------------------------------------- @@ -5047,7 +5046,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t * has both internal and external configuration matching * *config_ptr. * - * Do nothing on success. On failure, set pass to FALSE, and + * Do nothing on success. On failure, set pass to false, and * load an error message into failue_mssg. Note that * failure_msg is assumed to be at least 128 bytes in length. * @@ -5057,7 +5056,7 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t */ void -validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t compare_init, int test_num) +validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, bool compare_init, int test_num) { H5F_t *file_ptr = NULL; H5C_t *cache_ptr = NULL; @@ -5073,7 +5072,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (file_ptr == NULL) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Can't get file_ptr #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5088,7 +5087,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (cache_ptr == NULL || cache_ptr->resize_ctl.version != H5C__CURR_AUTO_SIZE_CTL_VER) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Can't access cache resize_ctl #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5099,7 +5098,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (!resize_configs_are_equal(&int_config, &cache_ptr->resize_ctl, compare_init)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Unexpected internal config #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5112,7 +5111,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t if (H5Fget_mdc_config(file_id, &scratch) < 0) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "H5Fget_mdc_config() failed #%d.", test_num); failure_mssg = tmp_msg_buf; } @@ -5122,7 +5121,7 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t /* Recall that in any configuration supplied by the cache * at run time, the set_initial_size field will always - * be FALSE, regardless of the value passed in. Thus we + * be false, regardless of the value passed in. Thus we * always presume that this field need not match that of * the supplied external configuration. * @@ -5131,9 +5130,9 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t * Depending on circumstances, this may or may not match * the original. Hence the compare_init parameter. */ - if (!CACHE_CONFIGS_EQUAL((*ext_config_ptr), scratch, FALSE, compare_init)) { + if (!CACHE_CONFIGS_EQUAL((*ext_config_ptr), scratch, false, compare_init)) { - pass = FALSE; + pass = false; HDsnprintf(tmp_msg_buf, sizeof(tmp_msg_buf), "Unexpected external config #%d.", test_num); failure_mssg = tmp_msg_buf; } |