diff options
Diffstat (limited to 'src')
111 files changed, 2339 insertions, 2339 deletions
@@ -711,7 +711,7 @@ done: * * Purpose: * Finishes initializing an attributes the open - * + * * Usage: * herr_t H5A_open_common(loc, name, dxpl_id) * const H5G_loc_t *loc; IN: Pointer to group location for object @@ -832,7 +832,7 @@ done: * Function: H5A_open_by_name * * Purpose: Open an attribute in an object header, according to it's name - * + * * Return: Non-negative on success/Negative on failure * * Programmer: Quincey Koziol @@ -1405,7 +1405,7 @@ done: NAME H5A_get_name PURPOSE - Private function for H5Aget_name. Gets a copy of the name for an + Private function for H5Aget_name. Gets a copy of the name for an attribute RETURNS This function returns the length of the attribute's name (which may be @@ -2391,7 +2391,7 @@ H5A_free(H5A_t *attr) HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release dataspace info") attr->shared->ds = NULL; } - if(attr->shared->data) + if(attr->shared->data) attr->shared->data = H5FL_BLK_FREE(attr_buf, attr->shared->data); done: @@ -2429,7 +2429,7 @@ H5A_close(H5A_t *attr) if(attr->obj_opened && (H5O_close(&(attr->shared->oloc)) < 0)) HGOTO_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't release object header info") - /* Reference count can be 0. It only happens when H5A_create fails. */ + /* Reference count can be 0. It only happens when H5A_create fails. */ if(1 >= attr->shared->nrefs) { /* Free dynamicly allocated items */ if(H5A_free(attr) < 0) @@ -746,9 +746,9 @@ done: * Added code to free the auxiliary structure and its * associated slist if present. * JRM - 6/28/05 - * + * * Added code to close the trace file if it is present. - * + * * JRM - 6/8/06 * *------------------------------------------------------------------------- @@ -830,15 +830,15 @@ done: * 6/30/06 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- */ herr_t -H5AC_expunge_entry(H5F_t *f, - hid_t dxpl_id, - const H5AC_class_t *type, +H5AC_expunge_entry(H5F_t *f, + hid_t dxpl_id, + const H5AC_class_t *type, haddr_t addr) { herr_t result; @@ -862,8 +862,8 @@ H5AC_expunge_entry(H5F_t *f, cache_ptr = f->shared->cache; #if H5AC__TRACE_FILE_ENABLED - /* For the expunge entry call, only the addr, and type id are really - * necessary in the trace file. Write the return value to catch occult + /* For the expunge entry call, only the addr, and type id are really + * necessary in the trace file. Write the return value to catch occult * errors. */ if ( ( cache_ptr != NULL ) && @@ -1002,8 +1002,8 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags) /* For the flush, only the flags are really necessary in the trace file. * Write the result to catch occult errors. */ - if ( ( f != NULL ) && - ( f->shared != NULL ) && + if ( ( f != NULL ) && + ( f->shared != NULL ) && ( f->shared->cache != NULL ) && ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { @@ -1281,8 +1281,8 @@ H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void * HDassert(thing); #if H5AC__TRACE_FILE_ENABLED - /* For the insert, only the addr, size, type id and flags are really - * necessary in the trace file. Write the result to catch occult + /* For the insert, only the addr, size, type id and flags are really + * necessary in the trace file. Write the result to catch occult * errors. * * Note that some data is not available right now -- put what we can @@ -1369,8 +1369,8 @@ done: #if H5AC__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %d\n", trace, - (int)trace_entry_size, + HDfprintf(trace_file_ptr, "%s %d %d\n", trace, + (int)trace_entry_size, (int)ret_value); } #endif /* H5AC__TRACE_FILE_ENABLED */ @@ -1417,8 +1417,8 @@ H5AC_mark_pinned_entry_dirty(H5F_t * f, FUNC_ENTER_NOAPI(H5AC_mark_pinned_entry_dirty, FAIL) #if H5AC__TRACE_FILE_ENABLED - /* For the mark pinned entry dirty call, only the addr, size_changed, - * and new_size are really necessary in the trace file. Write the result + /* For the mark pinned entry dirty call, only the addr, size_changed, + * and new_size are really necessary in the trace file. Write the result * to catch occult errors. */ if ( ( f != NULL ) && @@ -1539,7 +1539,7 @@ H5AC_mark_pinned_or_protected_entry_dirty(H5F_t * f, #if H5AC__TRACE_FILE_ENABLED /* For the mark pinned or protected entry dirty call, only the addr - * is really necessary in the trace file. Write the result to catch + * is really necessary in the trace file. Write the result to catch * occult errors. */ if ( ( f != NULL ) && @@ -1671,7 +1671,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_ad HDassert(H5F_addr_ne(old_addr, new_addr)); #if H5AC__TRACE_FILE_ENABLED - /* For the rename call, only the old addr and new addr are really + /* For the rename call, only the old addr and new addr are really * necessary in the trace file. Include the type id so we don't have to * look it up. Also write the result to catch occult errors. */ @@ -1776,7 +1776,7 @@ H5AC_pin_protected_entry(H5F_t * f, FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL) #if H5AC__TRACE_FILE_ENABLED - /* For the pin protected entry call, only the addr is really necessary + /* For the pin protected entry call, only the addr is really necessary * in the trace file. Also write the result to catch occult errors. */ if ( ( f != NULL ) && @@ -1873,11 +1873,11 @@ done: * Added trace file support. * * JRM - 3/18/07 - * Modified code to support the new flags parameter for - * H5C_protect(). For now, that means passing in the + * Modified code to support the new flags parameter for + * H5C_protect(). For now, that means passing in the * H5C_READ_ONLY_FLAG if rw == H5AC_READ. * - * Also updated the trace file output to save the + * Also updated the trace file output to save the * rw parameter, since we are now doing something with it. * *------------------------------------------------------------------------- @@ -1917,9 +1917,9 @@ H5AC_protect(H5F_t *f, HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file") #if H5AC__TRACE_FILE_ENABLED - /* For the protect call, only the addr and type id is really necessary - * in the trace file. Include the size of the entry protected as a - * sanity check. Also indicate whether the call was successful to + /* For the protect call, only the addr and type id is really necessary + * in the trace file. Include the size of the entry protected as a + * sanity check. Also indicate whether the call was successful to * catch occult errors. */ if ( ( f != NULL ) && @@ -1986,7 +1986,7 @@ done: #if H5AC__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %d\n", trace, + HDfprintf(trace_file_ptr, "%s %d %d\n", trace, (int)trace_entry_size, (int)(ret_value != NULL)); } @@ -2030,8 +2030,8 @@ H5AC_resize_pinned_entry(H5F_t * f, FUNC_ENTER_NOAPI(H5AC_resize_pinned_entry, FAIL) #if H5AC__TRACE_FILE_ENABLED - /* For the resize pinned entry call, only the addr, and new_size are - * really necessary in the trace file. Write the result to catch + /* For the resize pinned entry call, only the addr, and new_size are + * really necessary in the trace file. Write the result to catch * occult errors. */ if ( ( f != NULL ) && @@ -2141,7 +2141,7 @@ H5AC_unpin_entry(H5F_t * f, FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL) #if H5AC__TRACE_FILE_ENABLED - /* For the unpin entry call, only the addr is really necessary + /* For the unpin entry call, only the addr is really necessary * in the trace file. Also write the result to catch occult errors. */ if ( ( f != NULL ) && @@ -2302,7 +2302,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, #if H5AC__TRACE_FILE_ENABLED /* For the unprotect call, only the addr, type id, flags, and possible - * new size are really necessary in the trace file. Write the return + * new size are really necessary in the trace file. Write the return * value to catch occult errors. */ if ( ( f != NULL ) && @@ -2413,8 +2413,8 @@ done: #if H5AC__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %x %d\n", - trace, + HDfprintf(trace_file_ptr, "%s %d %x %d\n", + trace, (int)trace_new_size, (unsigned)trace_flags, (int)ret_value); @@ -2539,11 +2539,11 @@ done: * * JRM - 7/28/07 * Added support for the new evictions enabled related fields. - * - * Observe that H5AC_get_cache_auto_resize_config() and + * + * Observe that H5AC_get_cache_auto_resize_config() and * H5AC_set_cache_auto_resize_config() are becoming generic - * metadata cache configuration routines as they gain - * switches for functions that are only tenuously related + * metadata cache configuration routines as they gain + * switches for functions that are only tenuously related * to auto resize configuration. * * JRM - 1/2/08 @@ -2808,7 +2808,7 @@ done: * Updated for the addition of H5AC_cache_config_t. * * John Mainzer -- 10/25/05 - * Added support for the new dirty_bytes_threshold field of + * Added support for the new dirty_bytes_threshold field of * both H5AC_cache_config_t and H5AC_aux_t. * * John Mainzer -- 6/7/06 @@ -2816,15 +2816,15 @@ done: * * John Mainzer -- 7/28/07 * Added support for the new evictions enabled related fields. - * - * Observe that H5AC_get_cache_auto_resize_config() and + * + * Observe that H5AC_get_cache_auto_resize_config() and * H5AC_set_cache_auto_resize_config() are becoming generic - * metadata cache configuration routines as they gain - * switches for functions that are only tenuously related + * metadata cache configuration routines as they gain + * switches for functions that are only tenuously related * to auto resize configuration. * * John Mainzer -- 1/3/07 - * Updated trace file code to record the new flash cache + * Updated trace file code to record the new flash cache * size increase related fields. * *------------------------------------------------------------------------- @@ -2971,16 +2971,16 @@ H5AC_set_cache_auto_resize_config(H5AC_t * cache_ptr, done: #if H5AC__TRACE_FILE_ENABLED - /* For the set cache auto resize config call, only the contents - * of the config is necessary in the trace file. Write the return + /* For the set cache auto resize config call, only the contents + * of the config is necessary in the trace file. Write the return * value to catch occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - HDfprintf(trace_file_ptr, - "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d\n", + HDfprintf(trace_file_ptr, + "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %f %f %d %d %d %f %f %d %d %d %d %f %d %d\n", "H5AC_set_cache_auto_resize_config", trace_config.version, (int)(trace_config.rpt_fcn_enabled), @@ -3048,9 +3048,9 @@ done: * are applied. * JRM - 5/15/06 * - * - Added code testing the evictions enabled field. At - * present this consists of verifying that if - * evictions_enabled is FALSE, then automatic cache + * - Added code testing the evictions enabled field. At + * present this consists of verifying that if + * evictions_enabled is FALSE, then automatic cache * resizing in disabled. * * JRM - 7/28/07 @@ -3103,7 +3103,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr) /* don't bother to test trace_file_name unless open_trace_file is TRUE */ if ( config_ptr->open_trace_file ) { - /* Can't really test the trace_file_name field without trying to + /* Can't really test the trace_file_name field without trying to * open the file, so we will content ourselves with a couple of * sanity checks on the length of the file name. */ @@ -3129,7 +3129,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr) } if ( ( config_ptr->evictions_enabled == FALSE ) && - ( ( config_ptr->incr_mode != H5C_incr__off ) || + ( ( config_ptr->incr_mode != H5C_incr__off ) || ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) || ( config_ptr->decr_mode != H5C_decr__off ) ) ) { diff --git a/src/H5AC2.c b/src/H5AC2.c index 25a3109..1be2c89 100644 --- a/src/H5AC2.c +++ b/src/H5AC2.c @@ -41,8 +41,8 @@ * facilitate re-use. Re-worked this file again to use H5C. * * John Mainzer, 10/18/07 - * Copied H5AC2.c to H5AC22.c and reworked to use H5C2 instead of H5C. - * All this is in support of cache API modifications needed for + * Copied H5AC2.c to H5AC22.c and reworked to use H5C2 instead of H5C. + * All this is in support of cache API modifications needed for * journaling. * *------------------------------------------------------------------------- @@ -183,7 +183,7 @@ static herr_t H5AC2_log_inserted_entry(H5F_t * f, H5AC2_t * cache_ptr, H5AC2_info_t * entry_ptr, const H5AC2_class_t * type, - haddr_t addr, + haddr_t addr, size_t size); static herr_t H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t * f, @@ -482,11 +482,11 @@ H5AC2_term_interface(void) * API. * JRM - 10/18/07 * - * Added the dxpl_id parameter, and updated for parameter + * Added the dxpl_id parameter, and updated for parameter * list changes in H5C2_create(). * JRM - 3/26/08 * - * Updated code for the removal of the f, dxpl_id, and + * Updated code for the removal of the f, dxpl_id, and * journal_recovered parameters for H5C2_create(). * * JRM 7/10/08 @@ -769,13 +769,13 @@ done: * Added code to free the auxiliary structure and its * associated slist if present. * JRM - 6/28/05 - * + * * Added code to close the trace file if it is present. - * + * * JRM - 6/8/06 - * + * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -847,7 +847,7 @@ done: /*------------------------------------------------------------------------- * Function: H5AC2_begin_transaction() * - * Purpose: Mark the beginning of a transaction. + * Purpose: Mark the beginning of a transaction. * * This function is just a wrapper for H5C2_begin_transaction(). * @@ -857,7 +857,7 @@ done: * 4/12/08 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- @@ -979,7 +979,7 @@ done: #if H5AC2__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %llu %d\n", trace, + HDfprintf(trace_file_ptr, "%s %llu %d\n", trace, *trans_num_ptr, (int)ret_value); } #endif /* H5AC2__TRACE_FILE_ENABLED */ @@ -996,7 +996,7 @@ done: * Fail if it exists and the journal recovered flag is * not set. * - * This function is just a wrapper for + * This function is just a wrapper for * H5C2_check_for_journaling(). * * Return: Non-negative on success/Negative on failure @@ -1005,7 +1005,7 @@ done: * 7/4/08 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- @@ -1032,14 +1032,14 @@ H5AC2_check_for_journaling(H5F_t * f, #if H5AC2__TRACE_FILE_ENABLED /* For the end transaction call, only the journal_recovered - * parameter is really needed. Write the return value to catch + * parameter is really needed. Write the return value to catch * occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - sprintf(trace, "H5AC2_check_for_journaling %d ", + sprintf(trace, "H5AC2_check_for_journaling %d ", (int)journal_recovered); } #endif /* H5AC2__TRACE_FILE_ENABLED */ @@ -1050,7 +1050,7 @@ H5AC2_check_for_journaling(H5F_t * f, * time. */ - result = H5C2_check_for_journaling(f, dxpl_id, cache_ptr, + result = H5C2_check_for_journaling(f, dxpl_id, cache_ptr, journal_recovered); if ( result != SUCCEED ) { @@ -1084,7 +1084,7 @@ done: * 8/15/08 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- @@ -1112,11 +1112,11 @@ H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr, } #if H5AC2__TRACE_FILE_ENABLED - /* For the deregister metadata journaling status change callback - * call, only the idx is really needed. Write the return value to + /* For the deregister metadata journaling status change callback + * call, only the idx is really needed. Write the return value to * catch occult errors. */ - if ( ( cache_ptr != NULL ) + if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr((H5C2_t *)cache_ptr, &trace_file_ptr) >= 0 ) && @@ -1151,7 +1151,7 @@ done: /*------------------------------------------------------------------------- * Function: H5AC2_end_transaction() * - * Purpose: Mark the end of a transaction. + * Purpose: Mark the end of a transaction. * * This function is just a wrapper for H5C2_end_transaction(). * @@ -1161,7 +1161,7 @@ done: * 4/12/08 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- @@ -1192,14 +1192,14 @@ H5AC2_end_transaction(hbool_t do_transaction, #if H5AC2__TRACE_FILE_ENABLED /* For the end transaction call, only the transaction number and the - * api call name are really needed. Write the return value to catch + * api call name are really needed. Write the return value to catch * occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - sprintf(trace, "H5AC2_end_transaction %s %llu", + sprintf(trace, "H5AC2_end_transaction %s %llu", api_call_name, trans_num); } #endif /* H5AC2__TRACE_FILE_ENABLED */ @@ -1220,7 +1220,7 @@ H5AC2_end_transaction(hbool_t do_transaction, cache_ptr = f->shared->cache2; - result = H5C2_end_transaction(f, dxpl_id, cache_ptr, + result = H5C2_end_transaction(f, dxpl_id, cache_ptr, trans_num, api_call_name); if ( result < 0 ) { @@ -1232,7 +1232,7 @@ H5AC2_end_transaction(hbool_t do_transaction, if ( id_oloc_open ) { - result = H5O_close(id_oloc_ptr); + result = H5O_close(id_oloc_ptr); if ( result < 0 ) { @@ -1269,17 +1269,17 @@ done: * 6/30/06 * * Modifications: - * + * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- */ herr_t -H5AC2_expunge_entry(H5F_t *f, - hid_t dxpl_id, - const H5AC2_class_t *type, +H5AC2_expunge_entry(H5F_t *f, + hid_t dxpl_id, + const H5AC2_class_t *type, haddr_t addr) { herr_t result; @@ -1301,8 +1301,8 @@ H5AC2_expunge_entry(H5F_t *f, cache_ptr = f->shared->cache2; #if H5AC2__TRACE_FILE_ENABLED - /* For the expunge entry call, only the addr, and type id are really - * necessary in the trace file. Write the return value to catch occult + /* For the expunge entry call, only the addr, and type id are really + * necessary in the trace file. Write the return value to catch occult * errors. */ if ( ( cache_ptr != NULL ) && @@ -1414,7 +1414,7 @@ done: * Added trace file support. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -1444,8 +1444,8 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags) /* For the flush, only the flags are really necessary in the trace file. * Write the result to catch occult errors. */ - if ( ( f != NULL ) && - ( f->shared != NULL ) && + if ( ( f != NULL ) && + ( f->shared != NULL ) && ( f->shared->cache2 != NULL ) && ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) && ( trace_file_ptr != NULL ) ) { @@ -1567,7 +1567,7 @@ done: * Modifications: * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -1693,7 +1693,7 @@ done: * Added trace file support. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -1725,8 +1725,8 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size HDassert(thing); #if H5AC2__TRACE_FILE_ENABLED - /* For the insert, only the addr, size, type id and flags are really - * necessary in the trace file. Write the result to catch occult + /* For the insert, only the addr, size, type id and flags are really + * necessary in the trace file. Write the result to catch occult * errors. * * Note that some data is not available right now -- put what we can @@ -1813,8 +1813,8 @@ done: #if H5AC2__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %d\n", trace, - (int)trace_entry_size, + HDfprintf(trace_file_ptr, "%s %d %d\n", trace, + (int)trace_entry_size, (int)ret_value); } #endif /* H5AC2__TRACE_FILE_ENABLED */ @@ -1857,8 +1857,8 @@ H5AC2_mark_pinned_entry_dirty(void * thing, HDassert(thing); #if H5AC2__TRACE_FILE_ENABLED - /* For the mark pinned entry dirty call, only the addr, size_changed, - * and new_size are really necessary in the trace file. Write the result + /* For the mark pinned entry dirty call, only the addr, size_changed, + * and new_size are really necessary in the trace file. Write the result * to catch occult errors. */ if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && @@ -1929,13 +1929,13 @@ H5AC2_mark_pinned_or_protected_entry_dirty(void *thing) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5AC2_mark_pinned_or_protected_entry_dirty, FAIL) - + /* Sanity check */ HDassert(thing); #if H5AC2__TRACE_FILE_ENABLED /* For the mark pinned or protected entry dirty call, only the addr - * is really necessary in the trace file. Write the result to catch + * is really necessary in the trace file. Write the result to catch * occult errors. */ if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && @@ -2017,7 +2017,7 @@ done: * Added trace file support. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -2045,7 +2045,7 @@ H5AC2_rename(H5F_t *f, const H5AC2_class_t *type, haddr_t old_addr, haddr_t new_ HDassert(H5F_addr_ne(old_addr, new_addr)); #if H5AC2__TRACE_FILE_ENABLED - /* For the rename call, only the old addr and new addr are really + /* For the rename call, only the old addr and new addr are really * necessary in the trace file. Include the type id so we don't have to * look it up. Also write the result to catch occult errors. */ @@ -2143,7 +2143,7 @@ H5AC2_pin_protected_entry(void *thing) FUNC_ENTER_NOAPI(H5AC2_pin_protected_entry, FAIL) #if H5AC2__TRACE_FILE_ENABLED - /* For the pin protected entry call, only the addr is really necessary + /* For the pin protected entry call, only the addr is really necessary * in the trace file. Also write the result to catch occult errors. */ if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && @@ -2226,15 +2226,15 @@ done: * Added trace file support. * * JRM - 3/18/07 - * Modified code to support the new flags parameter for - * H5C2_protect(). For now, that means passing in the + * Modified code to support the new flags parameter for + * H5C2_protect(). For now, that means passing in the * H5C2_READ_ONLY_FLAG if rw == H5AC2_READ. * - * Also updated the trace file output to save the + * Also updated the trace file output to save the * rw parameter, since we are now doing something with it. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -2273,9 +2273,9 @@ H5AC2_protect(H5F_t *f, HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file") #if H5AC2__TRACE_FILE_ENABLED - /* For the protect call, only the addr and type id is really necessary - * in the trace file. Include the size of the entry protected as a - * sanity check. Also indicate whether the call was successful to + /* For the protect call, only the addr and type id is really necessary + * in the trace file. Include the size of the entry protected as a + * sanity check. Also indicate whether the call was successful to * catch occult errors. */ if ( ( f != NULL ) && @@ -2341,7 +2341,7 @@ done: #if H5AC2__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %d\n", trace, + HDfprintf(trace_file_ptr, "%s %d %d\n", trace, (int)trace_entry_size, (int)(ret_value != NULL)); } @@ -2358,7 +2358,7 @@ done: * Purpose: Register a metadata journaling status change callback, * and return the index assigned to the callback in *idx_ptr. * - * If config_ptr is not NULL, return the current metadata + * If config_ptr is not NULL, return the current metadata * journaling configuration in *config_ptr. * * Return: Non-negative on success/Negative on failure @@ -2367,7 +2367,7 @@ done: * 8/15/08 * * Modifications: - * + * * None. * *------------------------------------------------------------------------- @@ -2400,22 +2400,22 @@ H5AC2_register_mdjsc_callback(const H5F_t * file_ptr, } #if H5AC2__TRACE_FILE_ENABLED - /* For the register metadata journaling status change callback - * call, fnc_ptr, data_ptr, and the returned idx are all that + /* For the register metadata journaling status change callback + * call, fnc_ptr, data_ptr, and the returned idx are all that * are needed. Write the return value to catch occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - sprintf(trace, "H5AC2_register_mdjsc_callback 0x%lx 0x%lx ", + sprintf(trace, "H5AC2_register_mdjsc_callback 0x%lx 0x%lx ", (unsigned long)(fcn_ptr), (unsigned long)(data_ptr)); } #endif /* H5AC2__TRACE_FILE_ENABLED */ - result = H5C2_register_mdjsc_callback(cache_ptr, + result = H5C2_register_mdjsc_callback(cache_ptr, fcn_ptr, - data_ptr, + data_ptr, idx_ptr); if ( result < 0 ) { @@ -2440,7 +2440,7 @@ done: #if H5AC2__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %d\n", + HDfprintf(trace_file_ptr, "%s %d %d\n", trace, *idx_ptr, (int)ret_value); } #endif /* H5AC2__TRACE_FILE_ENABLED */ @@ -2478,8 +2478,8 @@ H5AC2_resize_pinned_entry(void *thing, size_t new_size) HDassert(thing); #if H5AC2__TRACE_FILE_ENABLED - /* For the resize pinned entry call, only the addr, and new_size are - * really necessary in the trace file. Write the result to catch + /* For the resize pinned entry call, only the addr, and new_size are + * really necessary in the trace file. Write the result to catch * occult errors. */ if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && @@ -2551,7 +2551,7 @@ H5AC2_unpin_entry(void *thing) HDassert(thing); #if H5AC2__TRACE_FILE_ENABLED - /* For the unpin entry call, only the addr is really necessary + /* For the unpin entry call, only the addr is really necessary * in the trace file. Also write the result to catch occult errors. */ if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) && @@ -2665,17 +2665,17 @@ done: * Added support for the trace file. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * - * Note that the H5AC2__SIZE_CHANGED_FLAG must now be set if + * Note that the H5AC2__SIZE_CHANGED_FLAG must now be set if * the size of the entry has changed. * *------------------------------------------------------------------------- */ herr_t -H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, +H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size_t new_size, void *thing, unsigned flags) { herr_t result; @@ -2705,7 +2705,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, #if H5AC2__TRACE_FILE_ENABLED /* For the unprotect call, only the addr, type id, flags, and possible - * new size are really necessary in the trace file. Write the return + * new size are really necessary in the trace file. Write the return * value to catch occult errors. */ if ( ( f != NULL ) && @@ -2725,7 +2725,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, dirtied = ( ( (flags & H5AC2__DIRTIED_FLAG) == H5AC2__DIRTIED_FLAG ) || ( ((H5AC2_info_t *)thing)->dirtied ) ); - size_changed = ( (flags & H5AC2__SIZE_CHANGED_FLAG) == + size_changed = ( (flags & H5AC2__SIZE_CHANGED_FLAG) == H5AC2__SIZE_CHANGED_FLAG ); #ifdef H5_HAVE_PARALLEL @@ -2755,7 +2755,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, result = H5C2_unprotect(f, dxpl_id, - type, + type, addr, thing, flags, @@ -2789,8 +2789,8 @@ done: #if H5AC2__TRACE_FILE_ENABLED if ( trace_file_ptr != NULL ) { - HDfprintf(trace_file_ptr, "%s %d %x %d\n", - trace, + HDfprintf(trace_file_ptr, "%s %d %x %d\n", + trace, (int)new_size, (unsigned)flags, (int)ret_value); @@ -2817,7 +2817,7 @@ done: * Modifications: * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -2875,7 +2875,7 @@ done: * H5C_stats(). * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -2924,15 +2924,15 @@ done: * * JRM - 7/28/07 * Added support for the new evictions enabled related fields. - * - * Observe that H5AC2_get_cache_auto_resize_config() and + * + * Observe that H5AC2_get_cache_auto_resize_config() and * H5AC2_set_cache_auto_resize_config() are becoming generic - * metadata cache configuration routines as they gain - * switches for functions that are only tenuously related + * metadata cache configuration routines as they gain + * switches for functions that are only tenuously related * to auto resize configuration. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * * JRM - 1/2/08 @@ -2942,7 +2942,7 @@ done: * JRM -- 4/12/08 * Added support for the new journaling control fields. * - * JRM - 8/1/08 + * JRM - 8/1/08 * Removed support for the new journaling control fields. * This functionality is now handled through the * H5AC2_jnl_config_t structure and the related calls. @@ -2992,7 +2992,7 @@ H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr, "H5C2_get_cache_auto_resize_config() failed.") } - result = H5C2_get_evictions_enabled((const H5C2_t *)cache_ptr, + result = H5C2_get_evictions_enabled((const H5C2_t *)cache_ptr, &evictions_enabled); if ( result < 0 ) { @@ -3063,12 +3063,12 @@ done: /*------------------------------------------------------------------------- * Function: H5AC2_get_jnl_config * - * Purpose: Get the current journaling configuration and load it into + * Purpose: Get the current journaling configuration and load it into * the supplied instance of H5AC2_jnl_config_t. * - * For the moment, the only journaling we do is metadata - * journaling, so in effect this function is a wrapper - * function for H5C2_get_journal_config(). + * For the moment, the only journaling we do is metadata + * journaling, so in effect this function is a wrapper + * function for H5C2_get_journal_config(). * * Return: SUCCEED on success, and FAIL on failure. * @@ -3078,7 +3078,7 @@ done: * Modifications: * * JRM -- 8/14/08 - * Reworked for change in argument list to + * Reworked for change in argument list to * H5C2_get_journal_config(). * *------------------------------------------------------------------------- @@ -3169,7 +3169,7 @@ done: * Modifications: * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -3219,7 +3219,7 @@ done: * Modifications: * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -3263,7 +3263,7 @@ done: * Modifications: * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * *------------------------------------------------------------------------- @@ -3308,7 +3308,7 @@ done: * Updated for the addition of H5AC2_cache_config_t. * * John Mainzer -- 10/25/05 - * Added support for the new dirty_bytes_threshold field of + * Added support for the new dirty_bytes_threshold field of * both H5AC2_cache_config_t and H5AC2_aux_t. * * John Mainzer -- 6/7/06 @@ -3316,15 +3316,15 @@ done: * * John Mainzer -- 7/28/07 * Added support for the new evictions enabled related fields. - * - * Observe that H5AC2_get_cache_auto_resize_config() and + * + * Observe that H5AC2_get_cache_auto_resize_config() and * H5AC2_set_cache_auto_resize_config() are becoming generic - * metadata cache configuration routines as they gain - * switches for functions that are only tenuously related + * metadata cache configuration routines as they gain + * switches for functions that are only tenuously related * to auto resize configuration. * * JRM - 10/18/07 - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * * John Mainzer -- 1/3/07 @@ -3336,7 +3336,7 @@ done: * This required the addition of the dxpl_id parameter. * * John Mainzer -- 8/1/08 - * Pulled journaling configuration back out of the + * Pulled journaling configuration back out of the * function, and teh dxpl_id parameter with it. * *------------------------------------------------------------------------- @@ -3404,15 +3404,15 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr, done: #if H5AC2__TRACE_FILE_ENABLED - /* For the set cache auto resize config call, only the contents - * of the config is necessary in the trace file. Write the return + /* For the set cache auto resize config call, only the contents + * of the config is necessary in the trace file. Write the return * value to catch occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - HDfprintf(trace_file_ptr, + HDfprintf(trace_file_ptr, "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %d %d %f %f %d %f %f %d %d %d %d %f %d %d\n", "H5AC2_set_cache_auto_resize_config", trace_config.version, @@ -3459,7 +3459,7 @@ done: * Purpose: Manage changes in journaling configuration. * * At present, metadata journaling is the only journaling we - * do, so this function can be thought of as a wrapper for + * do, so this function can be thought of as a wrapper for * H5C2_begin_journaling() and H5C2_end_journaling(). * * Return: SUCCEED on success, and FAIL on failure. @@ -3470,17 +3470,17 @@ done: * Modifications: * * JRM -- 8/14/08 - * Revised code for the use of the H5C2_mdj_config_t + * Revised code for the use of the H5C2_mdj_config_t * structure in H5C2_get_journal_config() and - * H5C2_begin_journaling(). + * H5C2_begin_journaling(). * - * Per Quincey's request, also added code to - * throw an error if journaling is requested when + * Per Quincey's request, also added code to + * throw an error if journaling is requested when * it is already enabled, or if the end of journaling * is requested when it is already disabled. * - * Note that this required the addition of the - * initializing parameter, which allows us to + * Note that this required the addition of the + * initializing parameter, which allows us to * avoid generating an error on startup. * *------------------------------------------------------------------------- @@ -3551,7 +3551,7 @@ H5AC2_set_jnl_config(H5F_t * f, if ( config_ptr->enable_journaling != internal_config.enable_journaling ) { /* we have work to do -- start or stop journaling as requested */ - + if ( config_ptr->enable_journaling ) { internal_config.enable_journaling = config_ptr->enable_journaling; @@ -3565,7 +3565,7 @@ H5AC2_set_jnl_config(H5F_t * f, internal_config.jbrb_buf_size = config_ptr->jbrb_buf_size; internal_config.jbrb_num_bufs = config_ptr->jbrb_num_bufs; internal_config.jbrb_use_aio = config_ptr->jbrb_use_aio; - internal_config.jbrb_human_readable = + internal_config.jbrb_human_readable = config_ptr->jbrb_human_readable; result = H5C2_begin_journaling(f, @@ -3605,15 +3605,15 @@ H5AC2_set_jnl_config(H5F_t * f, done: #if H5AC2__TRACE_FILE_ENABLED - /* For the set cache journaling config call, only the fields - * of the config that pretain to journaling are necessary in + /* For the set cache journaling config call, only the fields + * of the config that pretain to journaling are necessary in * the trace file. Write the return value to catch occult errors. */ if ( ( cache_ptr != NULL ) && ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) && ( trace_file_ptr != NULL ) ) { - HDfprintf(trace_file_ptr, + HDfprintf(trace_file_ptr, "%s %d %d \"%s\" %d %d %d %d %d %d\n", "H5AC2_set_jnl_config", trace_config.version, @@ -3636,8 +3636,8 @@ done: /*------------------------------------------------------------------------- * Function: H5AC2_set_cache_config * - * Purpose: Handle all configuration switches in an instance of - * H5AC2_cache_config_t. + * Purpose: Handle all configuration switches in an instance of + * H5AC2_cache_config_t. * * Return: SUCCEED on success, and FAIL on failure. * @@ -3809,14 +3809,14 @@ done: * are applied. * JRM - 5/15/06 * - * - Added code testing the evictions enabled field. At - * present this consists of verifying that if - * evictions_enabled is FALSE, then automatic cache + * - Added code testing the evictions enabled field. At + * present this consists of verifying that if + * evictions_enabled is FALSE, then automatic cache * resizing in disabled. * * JRM - 7/28/07 * - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * JRM - 10/18/07 * @@ -3870,7 +3870,7 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr) /* don't bother to test trace_file_name unless open_trace_file is TRUE */ if ( config_ptr->open_trace_file ) { - /* Can't really test the trace_file_name field without trying to + /* Can't really test the trace_file_name field without trying to * open the file, so we will content ourselves with a couple of * sanity checks on the length of the file name. */ @@ -3896,7 +3896,7 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr) } if ( ( config_ptr->evictions_enabled == FALSE ) && - ( ( config_ptr->incr_mode != H5C2_incr__off ) || + ( ( config_ptr->incr_mode != H5C2_incr__off ) || ( config_ptr->incr_mode != H5C2_decr__off ) ) ) { HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \ @@ -3939,7 +3939,7 @@ done: /*------------------------------------------------------------------------- * Function: H5AC2_validate_jnl_config() * - * Purpose: Run a sanity check on the contents of the supplied + * Purpose: Run a sanity check on the contents of the supplied * instance of H5AC2_jnl_config_t. * * Do nothing and return SUCCEED if no errors are detected, @@ -4000,7 +4000,7 @@ H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr) if(NULL == config_ptr->journal_file_path) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "config_ptr->journal_file_path is NULL.") - /* Can't really test the journal_file_path field without trying to + /* Can't really test the journal_file_path field without trying to * open the file, so we will content ourselves with a couple of * sanity checks on the length of the file name. */ @@ -4119,7 +4119,7 @@ H5AC2_validate_cache_config_ver(int version_num) * * Modifications: * - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * JRM - 10/18/07 * @@ -4184,7 +4184,7 @@ done: * * Modifications: * - * Modified code in support of revised cache API needed + * Modified code in support of revised cache API needed * to permit journaling. * JRM - 10/18/07 * @@ -5665,7 +5665,7 @@ H5AC2_receive_and_apply_clean_list(H5F_t * f, /* mark the indicated entries as clean */ - if ( H5C2_mark_entries_as_clean(f, dxpl_id, + if ( H5C2_mark_entries_as_clean(f, dxpl_id, (int32_t)num_entries, &(haddr_buf_ptr[0])) < 0 ) { diff --git a/src/H5AC2private.h b/src/H5AC2private.h index 1708295..abd12ed 100644 --- a/src/H5AC2private.h +++ b/src/H5AC2private.h @@ -293,7 +293,7 @@ H5_DLL herr_t H5AC2_check_for_journaling(H5F_t * f, H5_DLL herr_t H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr, int32_t idx); -H5_DLL herr_t H5AC2_create(H5F_t *f, +H5_DLL herr_t H5AC2_create(H5F_t *f, H5AC2_cache_config_t *config_ptr); H5_DLL herr_t H5AC2_begin_transaction(hid_t id, @@ -316,7 +316,7 @@ H5_DLL herr_t H5AC2_get_entry_status(H5F_t * f, haddr_t addr, unsigned * status_ptr); H5_DLL herr_t H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, - haddr_t addr, size_t len, void *thing, + haddr_t addr, size_t len, void *thing, unsigned int flags); H5_DLL herr_t H5AC2_pin_protected_entry(void * thing); H5_DLL void * H5AC2_protect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, diff --git a/src/H5AC2public.h b/src/H5AC2public.h index 8c4051c..5a57913 100644 --- a/src/H5AC2public.h +++ b/src/H5AC2public.h @@ -55,7 +55,7 @@ extern "C" { * structure. * * Similarly, the open_trace_file, close_trace_file, and trace_file_name - * fields do not appear in H5C2_auto_size_ctl_t, as most trace file + * fields do not appear in H5C2_auto_size_ctl_t, as most trace file * issues are handled at the H5AC2 level. The one exception is storage of * the pointer to the trace file, which is handled by H5C2. * @@ -80,7 +80,7 @@ extern "C" { * * The trace file is a debuging feature that allow the capture of * top level metadata cache requests for purposes of debugging and/or - * optimization. This field should normally be set to FALSE, as + * optimization. This field should normally be set to FALSE, as * trace file collection imposes considerable overhead. * * This field should only be set to TRUE when the trace_file_name @@ -98,7 +98,7 @@ extern "C" { * trace_file_name: Full path of the trace file to be opened if the * open_trace_file field is TRUE. * - * In the parallel case, an ascii representation of the mpi rank of + * In the parallel case, an ascii representation of the mpi rank of * the process will be appended to the file name to yield a unique * trace file name for each process. * @@ -106,12 +106,12 @@ extern "C" { * characters. * * evictions_enabled: Boolean field used to either report the current - * evictions enabled status of the cache, or to set the cache's + * evictions enabled status of the cache, or to set the cache's * evictions enabled status. * - * In general, the metadata cache should always be allowed to - * evict entries. However, in some cases it is advantageous to - * disable evictions briefly, and thereby postpone metadata + * In general, the metadata cache should always be allowed to + * evict entries. However, in some cases it is advantageous to + * disable evictions briefly, and thereby postpone metadata * writes. However, this must be done with care, as the cache * can grow quickly. If you do this, re-enable evictions as * soon as possible and monitor cache size. @@ -177,7 +177,7 @@ extern "C" { * at its maximum size, or if the cache is not already using * all available space. * - * Note that you must set decr_mode to H5C2_incr__off if you + * Note that you must set decr_mode to H5C2_incr__off if you * disable metadata cache entry evictions. * * lower_hr_threshold: Lower hit rate threshold. If the increment mode @@ -291,7 +291,7 @@ extern "C" { * over the last epoch exceeds the value provided in the * upper_hr_threshold field. * - * Note that you must set decr_mode to H5C2_decr__off if you + * Note that you must set decr_mode to H5C2_decr__off if you * disable metadata cache entry evictions. * * upper_hr_threshold: Upper hit rate threshold. The use of this field @@ -449,11 +449,11 @@ typedef struct H5AC2_cache_config_t * structure H5AC2_jnl_config_t * * H5AC2_jnl_config_t is a public structure intended for use in public APIs. - * At least in its initial incarnation, it is intended to package all the - * data needed to configure metadata journaling. In the future, we may + * At least in its initial incarnation, it is intended to package all the + * data needed to configure metadata journaling. In the future, we may * use it to package configuration data for other types of journaling as well. * - * The fields of the structure are discussed individually below. Note + * The fields of the structure are discussed individually below. Note * that the fields with the "jbrb_" prefix are used to configure the * journal buffer ring buffer -- a ring buffer of buffers used to buffer * output of journal messages. @@ -463,17 +463,17 @@ typedef struct H5AC2_cache_config_t * H5AC2_cache_config_t passed to the cache must have a known * version number, or an error will be flagged. * - * enable_journaling: Boolean flag that is set to TRUE if journaling is - * to be enabled, and to FALSE otherwise. + * enable_journaling: Boolean flag that is set to TRUE if journaling is + * to be enabled, and to FALSE otherwise. * * When the cache configuration is reported, this field is TRUE iff * journaling is enabled. * - * journal_file_path: Full path of the file to be used to store the + * journal_file_path: Full path of the file to be used to store the * metadata journal. This field is only defined if enable_journaling * is TRUE. * - * At present, the length of the journal file path is restricted to + * At present, the length of the journal file path is restricted to * no more than H5AC2__MAX_JOURNAL_FILE_NAME_LEN. * * journal_recovered: Boolean flag use to indicate that we are opening @@ -483,22 +483,22 @@ typedef struct H5AC2_cache_config_t * Unless you are the writer of a new journal recovery tool, you * should always set this field to FALSE. * - * jbrb_buf_size: size_t containing the size of each individual buffer + * jbrb_buf_size: size_t containing the size of each individual buffer * in the journal buffer ring buffer. This size should be chosen - * to be some multiple of the block size used by the file system + * to be some multiple of the block size used by the file system * on which the journal file will be written. * * jbrb_num_bufs: Integer containing the number of buffers in the journal * buffer ring buffer. If synchronous I/O is used, one or two buffers * is sufficient. If asynchronous I/O is used, the number of buffers - * should be sufficiently large that a write on buffer is likely to + * should be sufficiently large that a write on buffer is likely to * complete before that buffer is needed again. * - * jbrb_use_aio: Boolean flag indicating whether we should use + * jbrb_use_aio: Boolean flag indicating whether we should use * asynchronous I/O for journal entry writes. * * jbrb_human_readable: Boolean flag which determines whether the journal - * file will be written in human readable form. In general, this + * file will be written in human readable form. In general, this * field should be set to false, as the human readable journal * file is at least twice a large as the machine readable version. * diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h index 97be6f4..592b499 100644 --- a/src/H5ACpublic.h +++ b/src/H5ACpublic.h @@ -58,7 +58,7 @@ extern "C" { * structure. * * Similarly, the open_trace_file, close_trace_file, and trace_file_name - * fields do not appear in H5C_auto_size_ctl_t, as most trace file + * fields do not appear in H5C_auto_size_ctl_t, as most trace file * issues are handled at the H5AC level. The one exception is storage of * the pointer to the trace file, which is handled by H5C. * @@ -83,7 +83,7 @@ extern "C" { * * The trace file is a debuging feature that allow the capture of * top level metadata cache requests for purposes of debugging and/or - * optimization. This field should normally be set to FALSE, as + * optimization. This field should normally be set to FALSE, as * trace file collection imposes considerable overhead. * * This field should only be set to TRUE when the trace_file_name @@ -101,7 +101,7 @@ extern "C" { * trace_file_name: Full path of the trace file to be opened if the * open_trace_file field is TRUE. * - * In the parallel case, an ascii representation of the mpi rank of + * In the parallel case, an ascii representation of the mpi rank of * the process will be appended to the file name to yield a unique * trace file name for each process. * @@ -109,12 +109,12 @@ extern "C" { * characters. * * evictions_enabled: Boolean field used to either report the current - * evictions enabled status of the cache, or to set the cache's + * evictions enabled status of the cache, or to set the cache's * evictions enabled status. * - * In general, the metadata cache should always be allowed to - * evict entries. However, in some cases it is advantageous to - * disable evictions briefly, and thereby postpone metadata + * In general, the metadata cache should always be allowed to + * evict entries. However, in some cases it is advantageous to + * disable evictions briefly, and thereby postpone metadata * writes. However, this must be done with care, as the cache * can grow quickly. If you do this, re-enable evictions as * soon as possible and monitor cache size. @@ -180,7 +180,7 @@ extern "C" { * at its maximum size, or if the cache is not already using * all available space. * - * Note that you must set decr_mode to H5C_incr__off if you + * Note that you must set decr_mode to H5C_incr__off if you * disable metadata cache entry evictions. * * lower_hr_threshold: Lower hit rate threshold. If the increment mode @@ -217,7 +217,7 @@ extern "C" { * The addition of the flash increment mode was occasioned by performance * problems that appear when a local heap is increased to a size in excess * of the current cache size. While the existing re-size code dealt with - * this eventually, performance was very bad for the remainder of the + * this eventually, performance was very bad for the remainder of the * epoch. * * At present, there are two possible values for the flash_incr_mode: @@ -242,20 +242,20 @@ extern "C" { * * With a little thought, it should be obvious that the above flash * cache size increase algorithm is not sufficient for all circumstances -- - * for example, suppose the user round robins through + * for example, suppose the user round robins through * (1/flash_threshold) +1 groups, adding one data set to each on each * pass. Then all will increase in size at about the same time, requiring * the max cache size to at least double to maintain acceptable * performance, however the above flash increment algorithm will not be * triggered. * - * Hopefully, the add space algorithms detailed above will be sufficient - * for the performance problems encountered to date. However, we should + * Hopefully, the add space algorithms detailed above will be sufficient + * for the performance problems encountered to date. However, we should * expect to revisit the issue. * * flash_multiple: Double containing the multiple described above in the - * H5C_flash_incr__add_space section of the discussion of the - * flash_incr_mode section. This field is ignored unless flash_incr_mode + * H5C_flash_incr__add_space section of the discussion of the + * flash_incr_mode section. This field is ignored unless flash_incr_mode * is H5C_flash_incr__add_space. * * flash_threshold: Double containing the factor by which current max cache size @@ -295,7 +295,7 @@ extern "C" { * over the last epoch exceeds the value provided in the * upper_hr_threshold field. * - * Note that you must set decr_mode to H5C_decr__off if you + * Note that you must set decr_mode to H5C_decr__off if you * disable metadata cache entry evictions. * * upper_hr_threshold: Upper hit rate threshold. The use of this field diff --git a/src/H5Adense.c b/src/H5Adense.c index 79cd6fe..4f9dcce 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -1475,7 +1475,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, +H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n) { H5HF_t *fheap = NULL; /* Fractal heap handle */ diff --git a/src/H5Aint.c b/src/H5Aint.c index 23a4e15..2469579 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -384,7 +384,7 @@ H5A_attr_cmp_name_inc(const void *attr1, const void *attr2) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_inc) - FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr1)->shared->name, + FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr1)->shared->name, (*(const H5A_t **)attr2)->shared->name)) } /* end H5A_attr_cmp_name_inc() */ @@ -412,7 +412,7 @@ H5A_attr_cmp_name_dec(const void *attr1, const void *attr2) { FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_dec) - FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr2)->shared->name, + FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t **)attr2)->shared->name, (*(const H5A_t **)attr1)->shared->name)) } /* end H5A_attr_cmp_name_dec() */ @@ -679,7 +679,7 @@ H5O_ainfo_t * H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo) { H5O_ainfo_t *ret_value; /* Return value */ - + FUNC_ENTER_NOAPI(H5A_get_ainfo, NULL) /* check arguments */ @@ -731,7 +731,7 @@ H5A_set_version(const H5F_t *f, H5A_t *attr) { hbool_t type_shared, space_shared; /* Flags to indicate that shared messages are used for this attribute */ hbool_t use_latest_format; /* Flag indicating the newest file format should be used */ - + FUNC_ENTER_NOAPI_NOFUNC(H5A_set_version) /* check arguments */ diff --git a/src/H5Apublic.h b/src/H5Apublic.h index 3586bad..99ca90e 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -48,7 +48,7 @@ H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id); H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id, hid_t lapl_id); -H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, +H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t aapl_id, hid_t lapl_id); H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf); @@ -86,7 +86,7 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char *attr_name, hid_t lapl_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 9a10ad9..85b0db7 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -66,22 +66,22 @@ /* Metadata cache callbacks */ static void *H5B2_cache_hdr_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5B2_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, +static herr_t H5B2_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5B2_cache_hdr_free_icr(haddr_t addr, size_t len, void *thing); static void *H5B2_cache_internal_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5B2_cache_internal_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5B2_cache_internal_free_icr(haddr_t addr, size_t len, void *thing); static void *H5B2_cache_leaf_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5B2_cache_leaf_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, +static herr_t H5B2_cache_leaf_serialize(const H5F_t *f, hid_t dxpl_id, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5B2_cache_leaf_free_icr(haddr_t addr, size_t len, void *thing); @@ -152,7 +152,7 @@ const H5AC2_class_t H5AC2_BT2_LEAF[1] = {{ *------------------------------------------------------------------------- */ static void * -H5B2_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, +H5B2_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image, void *_udata, hbool_t UNUSED *dirty) { H5B2_hdr_cache_ud_t *udata = (H5B2_hdr_cache_ud_t *)_udata; @@ -256,8 +256,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, - haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, +H5B2_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, + haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { @@ -500,9 +500,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_internal_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, - haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, - unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, +H5B2_cache_internal_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, + haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, + unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5B2_shared_t *shared; /* Shared B-tree information */ @@ -731,9 +731,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B2_cache_leaf_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, - haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, - unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, +H5B2_cache_leaf_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, + haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, + unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5B2_shared_t *shared; /* Shared B-tree information */ diff --git a/src/H5B2int.c b/src/H5B2int.c index a6d85b4..d991347 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -220,7 +220,7 @@ HDmemset(shared->page, 0, shared->node_size); shared->node_info[u].split_nrec = (shared->node_info[u].max_nrec * shared->split_percent) / 100; shared->node_info[u].merge_nrec = (shared->node_info[u].max_nrec * shared->merge_percent) / 100; - shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) * + shared->node_info[u].cum_max_nrec = ((shared->node_info[u].max_nrec + 1) * shared->node_info[u - 1].cum_max_nrec) + shared->node_info[u].max_nrec; u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[u].cum_max_nrec); H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[u].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char) @@ -591,7 +591,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr) H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].max_nrec, /* From: */ sz_max_nrec, /* From: */ size_t, /* To: */ unsigned) shared->node_info[shared->depth].split_nrec = (shared->node_info[shared->depth].max_nrec * shared->split_percent) / 100; shared->node_info[shared->depth].merge_nrec = (shared->node_info[shared->depth].max_nrec * shared->merge_percent) / 100; - shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) * + shared->node_info[shared->depth].cum_max_nrec = ((shared->node_info[shared->depth].max_nrec + 1) * shared->node_info[shared->depth - 1].cum_max_nrec) + shared->node_info[shared->depth].max_nrec; u_max_nrec_size = H5V_limit_enc_size((uint64_t)shared->node_info[shared->depth].cum_max_nrec); H5_ASSIGN_OVERFLOW(/* To: */ shared->node_info[shared->depth].cum_max_nrec_size, /* From: */ u_max_nrec_size, /* From: */ unsigned, /* To: */ unsigned char) @@ -3246,22 +3246,22 @@ done: /*------------------------------------------------------------------------- * Function: H5B2_iterate_size_node - * + * * Purpose: Iterate over all the records from a B-tree node, collecting * btree storage info. - * + * * Return: non-negative on success, negative on error - * + * * Programmer: Vailin Choi * July 12 2007 - * + * *------------------------------------------------------------------------- */ herr_t H5B2_iterate_size_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth, const H5B2_node_ptr_t *curr_node, hsize_t *btree_size) { - H5B2_shared_t *shared; /* Pointer to B-tree's shared information */ + H5B2_shared_t *shared; /* Pointer to B-tree's shared information */ H5B2_internal_t *internal = NULL; /* Pointer to internal node */ herr_t ret_value = SUCCEED; /* Iterator return value */ diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h index c88360d..3a2cbcd 100644 --- a/src/H5B2pkg.h +++ b/src/H5B2pkg.h @@ -143,7 +143,7 @@ typedef struct H5B2_internal_cache_ud_t { /* Callback info for loading a free space leaf node into the cache */ typedef struct H5B2_leaf_cache_ud_t { H5F_t *f; /* File that v2 b-tree header is within */ - const unsigned *nrec; /* Number of records in node to load */ + const unsigned *nrec; /* Number of records in node to load */ H5RC_t *bt2_shared; /* Ref counter for shared B-tree info */ } H5B2_leaf_cache_ud_t; diff --git a/src/H5Bcache.c b/src/H5Bcache.c index ac34564..b6dedb2 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -56,8 +56,8 @@ /* Metadata cache callbacks */ static void *H5B_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5B_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, - size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, +static herr_t H5B_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, + size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5B_free_icr(haddr_t addr, size_t len, void *thing); @@ -202,8 +202,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5B_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5B_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5B_t *bt = (H5B_t *)_thing; /* Pointer to the B-tree node */ @@ -538,7 +538,7 @@ if ( ( (entry_ptr) == NULL ) || \ * More pinned entry stats related updates. * * JRM -- 3/31/07 - * Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on + * Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on * read and write protects. * ***********************************************************************/ @@ -1117,12 +1117,12 @@ if ( ( (cache_ptr) == NULL ) || \ * JRM -- 8/25/06 * Added the H5C_DO_SANITY_CHECKS version of the macro. * - * This version maintains the slist_len_increase and + * This version maintains the slist_len_increase and * slist_size_increase fields that are used in sanity * checks in the flush routines. * - * All this is needed as the fractal heap needs to be - * able to dirty, resize and/or rename entries during the + * All this is needed as the fractal heap needs to be + * able to dirty, resize and/or rename entries during the * flush. * *------------------------------------------------------------------------- @@ -1209,7 +1209,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Switched over to using skip list routines. * * JRM -- 3/28/07 - * Updated sanity checks for the new is_read_only and + * Updated sanity checks for the new is_read_only and * ro_ref_count fields in H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -1257,11 +1257,11 @@ if ( ( (cache_ptr) == NULL ) || \ * JRM -- 8/27/06 * Added the H5C_DO_SANITY_CHECKS version of the macro. * - * This version maintains the slist_size_increase field + * This version maintains the slist_size_increase field * that are used in sanity checks in the flush routines. * - * All this is needed as the fractal heap needs to be - * able to dirty, resize and/or rename entries during the + * All this is needed as the fractal heap needs to be + * able to dirty, resize and/or rename entries during the * flush. * *------------------------------------------------------------------------- @@ -1352,7 +1352,7 @@ if ( ( (cache_ptr) == NULL ) || \ * to do if called for such an entry. * * JRM -- 3/28/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -1494,7 +1494,7 @@ if ( ( (cache_ptr) == NULL ) || \ * be called on a pinned entry. Added assert to verify this. * * JRM -- 3/28/07 - * Added sanity checks for the new is_read_only and + * Added sanity checks for the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -1749,7 +1749,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Inserted an assert to verify this. * * JRM - 8/9/06 - * Not any more. We must now allow insertion of pinned + * Not any more. We must now allow insertion of pinned * entries. Updated macro to support this. * * JRM - 3/28/07 @@ -1888,7 +1888,7 @@ if ( ( (cache_ptr) == NULL ) || \ * maintained by the replacement policy. * * JRM - 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -2052,7 +2052,7 @@ if ( ( (cache_ptr) == NULL ) || \ * nothing to be done. * * JRM - 3/28/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -2174,7 +2174,7 @@ if ( ( (cache_ptr) == NULL ) || \ * To do this, determine if the entry is pinned. If it is, * update the size of the pinned entry list. * - * If it isn't pinned, the entry must handled by the + * If it isn't pinned, the entry must handled by the * replacement policy. Update the appropriate replacement * policy data structures. * @@ -2190,7 +2190,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Modifications: * * JRM -- 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -2314,7 +2314,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Modifications: * * JRM -- 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C_cache_entry_t. * *------------------------------------------------------------------------- @@ -2658,7 +2658,7 @@ static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr, static void *H5C_epoch_marker_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata1, void *udata2); static herr_t H5C_epoch_marker_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, - haddr_t addr, void *thing, + haddr_t addr, void *thing, unsigned *flags_ptr); static herr_t H5C_epoch_marker_dest(H5F_t *f, void *thing); static herr_t H5C_epoch_marker_clear(H5F_t *f, void *thing, hbool_t dest); @@ -2831,16 +2831,16 @@ done: * * JRM -- 8/25/06 * Added initialization for the slist_len_increase and - * slist_size_increase fields. These fields are used + * slist_size_increase fields. These fields are used * for sanity checking in the flush process, and are not * compiled in unless H5C_DO_SANITY_CHECKS is TRUE. * * JRM -- 3/28/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * * JRM -- 7/27/07 - * Added initialization for the new evictions_enabled + * Added initialization for the new evictions_enabled * field of H5C_t. * * JRM -- 12/31/07 @@ -3151,9 +3151,9 @@ H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr, HDfprintf(stdout, "%sflash cache resize(%d) -- size threshold = %Zu.\n", - cache_ptr->prefix, + cache_ptr->prefix, (int)((cache_ptr->resize_ctl).flash_incr_mode), - cache_ptr->flash_size_increase_threshold); + cache_ptr->flash_size_increase_threshold); HDfprintf(stdout, "%s cache size increased from (%Zu/%Zu) to (%Zu/%Zu).\n", @@ -3390,8 +3390,8 @@ done: * * Function: H5C_expunge_entry * - * Purpose: Use this function to tell the cache to expunge an entry - * from the cache without writing it to disk even if it is + * Purpose: Use this function to tell the cache to expunge an entry + * from the cache without writing it to disk even if it is * dirty. The entry may not be either pinned or protected. * * Return: Non-negative on success/Negative on failure @@ -3459,7 +3459,7 @@ H5C_expunge_entry(H5F_t * f, "Target entry is pinned.") } - /* If we get this far, call H5C_flush_single_entry() with the + /* If we get this far, call H5C_flush_single_entry() with the * H5C__FLUSH_INVALIDATE_FLAG and the H5C__FLUSH_CLEAR_ONLY_FLAG. * This will clear the entry, and then delete it from the cache. */ @@ -3470,7 +3470,7 @@ H5C_expunge_entry(H5F_t * f, cache_ptr, entry_ptr->type, entry_ptr->addr, - H5C__FLUSH_INVALIDATE_FLAG | + H5C__FLUSH_INVALIDATE_FLAG | H5C__FLUSH_CLEAR_ONLY_FLAG, &first_flush, TRUE); @@ -3568,12 +3568,12 @@ done: * Updated function to handle pinned entries. * * JRM -- 8/19/06 - * Added code managing the new flush_in_progress field of + * Added code managing the new flush_in_progress field of * H5C_t. * * Also reworked function to allow for the possibility that * entries will be dirtied, resized, or renamed during flush - * callbacks. As a result, we may have to make multiple + * callbacks. As a result, we may have to make multiple * passes through the skip list before the cache is flushed. * * JRM -- 10/13/07 @@ -3587,8 +3587,8 @@ done: * * Note that this is a pretty bad scenario if it ever * happens. The code I have added should allow us to - * handle the situation under all but the worst conditions, - * but one can argue that I should just scream and die if I + * handle the situation under all but the worst conditions, + * but one can argue that I should just scream and die if I * ever detect the condidtion. * *------------------------------------------------------------------------- @@ -3697,7 +3697,7 @@ H5C_flush_cache(H5F_t * f, next_entry_ptr = NULL; } - + HDassert( node_ptr != NULL ); #if H5C_DO_SANITY_CHECKS @@ -3712,7 +3712,7 @@ H5C_flush_cache(H5F_t * f, * fractal heap, the entry flush callback can cause entries * to be dirtied, resized, and/or renamed. * - * To deal with this, we first make note of the initial + * To deal with this, we first make note of the initial * skip list length and size: */ initial_slist_len = cache_ptr->slist_len; @@ -3724,12 +3724,12 @@ H5C_flush_cache(H5F_t * f, flushed_entries_count = 0; flushed_entries_size = 0; - /* As mentioned above, there is the possibility that + /* As mentioned above, there is the possibility that * entries will be dirtied, resized, and/or flushed during - * our pass through the skip list. To capture the number - * of entries added, and the skip list size delta, + * our pass through the skip list. To capture the number + * of entries added, and the skip list size delta, * zero the slist_len_increase and slist_size_increase of - * the cache's instance of H5C_t. These fields will be + * the cache's instance of H5C_t. These fields will be * updated elsewhere to account for slist insertions and/or * dirty entry size changes. */ @@ -3780,7 +3780,7 @@ H5C_flush_cache(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "entry_ptr->magic invalid ?!?!"); - } else + } else #endif /* NDEBUG */ if ( ( ! entry_ptr->is_dirty ) || ( ! entry_ptr->in_slist ) ) { @@ -3817,7 +3817,7 @@ H5C_flush_cache(H5F_t * f, HDassert( entry_ptr != NULL ); HDassert( entry_ptr->in_slist ); - if ( ( ! flush_marked_entries ) || + if ( ( ! flush_marked_entries ) || ( entry_ptr->flush_marker ) ) { if ( entry_ptr->is_protected ) { @@ -3855,7 +3855,7 @@ H5C_flush_cache(H5F_t * f, FALSE); if ( status < 0 ) { - /* This shouldn't happen -- if it does, we are + /* This shouldn't happen -- if it does, we are * toast so just scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ @@ -3879,7 +3879,7 @@ H5C_flush_cache(H5F_t * f, FALSE); if ( status < 0 ) { - /* This shouldn't happen -- if it does, we are + /* This shouldn't happen -- if it does, we are * toast so just scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ @@ -3893,7 +3893,7 @@ H5C_flush_cache(H5F_t * f, #if H5C_DO_SANITY_CHECKS /* Verify that the slist size and length are as expected. */ - HDassert( (initial_slist_len + cache_ptr->slist_len_increase - + HDassert( (initial_slist_len + cache_ptr->slist_len_increase - flushed_entries_count) == cache_ptr->slist_len ); HDassert( (initial_slist_size + cache_ptr->slist_size_increase - flushed_entries_size) == cache_ptr->slist_size ); @@ -3984,7 +3984,7 @@ done: * find a case where it helps, lets get rid of it. * * - * Added some sanity checks to the change which verify the + * Added some sanity checks to the change which verify the * expected values of the new is_read_only and ro_ref_count * fields. * JRM - 3/29/07 @@ -4491,7 +4491,7 @@ done: * Purpose: Get the trace_file_ptr field from the cache. * * This field will either be NULL (which indicates that trace - * file logging is turned off), or contain a pointer to the + * file logging is turned off), or contain a pointer to the * open file to which trace file data is to be written. * * Return: Non-negative on success/Negative on failure @@ -4601,11 +4601,11 @@ done: * destroy_in_progress fields. * * JRM -- 3/29/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * * JRM -- 8/1/07 - * Added code to disable evictions when the new + * Added code to disable evictions when the new * evictions_enabled field is FALSE. * * JRM -- 12/31/07 @@ -4717,7 +4717,7 @@ H5C_insert_entry(H5F_t * f, } if ( ( cache_ptr->evictions_enabled ) && - ( (cache_ptr->index_size + entry_ptr->size) > + ( (cache_ptr->index_size + entry_ptr->size) > cache_ptr->max_cache_size ) ) { size_t space_needed; @@ -5191,7 +5191,7 @@ done: * * Modifications: * - * Added code to do a flash cache size increase if + * Added code to do a flash cache size increase if * appropriate. * JRM -- 1/11/08 * @@ -5242,7 +5242,7 @@ H5C_mark_pinned_entry_dirty(H5C_t * cache_ptr, size_increase = new_size - entry_ptr->size; - if ( size_increase >= + if ( size_increase >= cache_ptr->flash_size_increase_threshold ) { result = H5C__flash_increase_cache_size(cache_ptr, @@ -5494,7 +5494,7 @@ H5C_rename_entry(H5C_t * cache_ptr, * Since this is a simple re-name, cache size should be unaffected. * * Check to see if the target entry is in the process of being destroyed - * before we delete from the index, etc. If it is, all we do is + * before we delete from the index, etc. If it is, all we do is * change the addr. If the entry is only in the process of being flushed, * don't mark it as dirty either, lest we confuse the flush call back. */ @@ -5538,7 +5538,7 @@ H5C_rename_entry(H5C_t * cache_ptr, if ( removed_entry_from_slist ) { - /* we just removed the entry from the slist. Thus we + /* we just removed the entry from the slist. Thus we * must touch up cache_ptr->slist_len_increase and * cache_ptr->slist_size_increase to keep from skewing * the sanity checks. @@ -5579,8 +5579,8 @@ done: * Purpose: Resize a pinned entry. The target entry MUST be * be pinned, and MUST not be unprotected. * - * Resizing an entry dirties it, so if the entry is not - * already dirty, the function places the entry on the + * Resizing an entry dirties it, so if the entry is not + * already dirty, the function places the entry on the * skip list. * * Return: Non-negative on success/Negative on failure @@ -5590,7 +5590,7 @@ done: * * Modifications: * - * Added code to apply a flash cache size increment if + * Added code to apply a flash cache size increment if * appropriate. * JRM -- 1/11/08 * @@ -5633,8 +5633,8 @@ H5C_resize_pinned_entry(H5C_t * cache_ptr, "Entry is protected??") } - /* resizing dirties entries -- mark the entry as dirty if it - * isn't already + /* resizing dirties entries -- mark the entry as dirty if it + * isn't already */ entry_ptr->is_dirty = TRUE; @@ -5648,7 +5648,7 @@ H5C_resize_pinned_entry(H5C_t * cache_ptr, size_increase = new_size - entry_ptr->size; - if ( size_increase >= + if ( size_increase >= cache_ptr->flash_size_increase_threshold ) { result = H5C__flash_increase_cache_size(cache_ptr, @@ -5720,12 +5720,12 @@ done: * entries. * * JRM -- 2/16/07 - * Added conditional compile to avoid unused parameter + * Added conditional compile to avoid unused parameter * warning in production compile. * * JRM -- 4/4/07 - * Fixed typo -- canged macro call to - * H5C__UPDATE_STATS_FOR_UNPIN to call to + * Fixed typo -- canged macro call to + * H5C__UPDATE_STATS_FOR_UNPIN to call to * H5C__UPDATE_STATS_FOR_PIN. * *------------------------------------------------------------------------- @@ -5839,12 +5839,12 @@ done: * * JRM -- 6/23/06 * Modified code to allow dirty entries to be loaded from - * disk. This is necessary as a bug fix in the object + * disk. This is necessary as a bug fix in the object * header code requires us to modify a header as it is read. * * JRM -- 3/28/07 * Added the flags parameter and supporting code. At least - * for now, this parameter is used to allow the entry to + * for now, this parameter is used to allow the entry to * be protected read only, thus allowing multiple protects. * * Also added code to allow multiple read only protects @@ -5855,7 +5855,7 @@ done: * in H5C_t. * * JRM -- 1/3/08 - * Added to do a flash cache size increase if appropriate + * Added to do a flash cache size increase if appropriate * when a large entry is loaded. * *------------------------------------------------------------------------- @@ -5936,7 +5936,7 @@ H5C_protect(H5F_t * f, if ( ( cache_ptr->flash_size_increase_possible ) && ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) { - result = H5C__flash_increase_cache_size(cache_ptr, 0, + result = H5C__flash_increase_cache_size(cache_ptr, 0, entry_ptr->size); if ( result < 0 ) { @@ -5946,11 +5946,11 @@ H5C_protect(H5F_t * f, } } - /* try to free up some space if necessary and if evictions are - * permitted + /* try to free up some space if necessary and if evictions are + * permitted */ if ( ( cache_ptr->evictions_enabled ) && - ( (cache_ptr->index_size + entry_ptr->size) > + ( (cache_ptr->index_size + entry_ptr->size) > cache_ptr->max_cache_size ) ) { size_t space_needed; @@ -6056,7 +6056,7 @@ H5C_protect(H5F_t * f, if ( entry_ptr->is_protected ) { if ( ( read_only ) && ( entry_ptr->is_read_only ) ) { - + HDassert( entry_ptr->ro_ref_count > 0 ); (entry_ptr->ro_ref_count)++; @@ -6316,8 +6316,8 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, /* will set the increase possible fields to FALSE later if needed */ cache_ptr->size_increase_possible = TRUE; - cache_ptr->flash_size_increase_possible = TRUE; - cache_ptr->size_decrease_possible = TRUE; + cache_ptr->flash_size_increase_possible = TRUE; + cache_ptr->size_decrease_possible = TRUE; switch ( config_ptr->incr_mode ) { @@ -6340,7 +6340,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, } /* logically, this is were configuration for flash cache size increases - * should go. However, this configuration depends on max_cache_size, so + * should go. However, this configuration depends on max_cache_size, so * we wait until the end of the function, when this field is set. */ @@ -6388,7 +6388,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, if ( config_ptr->max_size == config_ptr->min_size ) { cache_ptr->size_increase_possible = FALSE; - cache_ptr->flash_size_increase_possible = FALSE; + cache_ptr->flash_size_increase_possible = FALSE; cache_ptr->size_decrease_possible = FALSE; } @@ -6483,7 +6483,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, } /* configure flash size increase facility. We wait until the - * end of the function, as we need the max_cache_size set before + * end of the function, as we need the max_cache_size set before * we start to keep things simple. * * If we haven't already ruled out flash cache size increases above, @@ -6495,12 +6495,12 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, switch ( config_ptr->flash_incr_mode ) { case H5C_flash_incr__off: - cache_ptr->flash_size_increase_possible = FALSE; + cache_ptr->flash_size_increase_possible = FALSE; break; case H5C_flash_incr__add_space: - cache_ptr->flash_size_increase_possible = TRUE; - cache_ptr->flash_size_increase_threshold = + cache_ptr->flash_size_increase_possible = TRUE; + cache_ptr->flash_size_increase_threshold = (size_t) (((double)(cache_ptr->max_cache_size)) * ((cache_ptr->resize_ctl).flash_threshold)); @@ -6511,7 +6511,7 @@ H5C_set_cache_auto_resize_config(H5C_t * cache_ptr, "Unknown flash_incr_mode?!?!?.") break; } - } + } done: @@ -6523,7 +6523,7 @@ done: /*------------------------------------------------------------------------- * Function: H5C_set_evictions_enabled() * - * Purpose: Set cache_ptr->evictions_enabled to the value of the + * Purpose: Set cache_ptr->evictions_enabled to the value of the * evictions enabled parameter. * * Return: SUCCEED on success, and FAIL on failure. @@ -6557,9 +6557,9 @@ H5C_set_evictions_enabled(H5C_t * cache_ptr, "Bad evictions_enabled on entry.") } - /* There is no fundamental reason why we should not permit + /* There is no fundamental reason why we should not permit * evictions to be disabled while automatic resize is enabled. - * However, I can't think of any good reason why one would + * However, I can't think of any good reason why one would * want to, and allowing it would greatly complicate testing * the feature. Hence the following: */ @@ -6743,8 +6743,8 @@ done: * JRM -- 8/23/06 * Added code supporting new flush related statistics. * - * JRM -- 3/31/07 - * Added code supporting the new write_protects, + * JRM -- 3/31/07 + * Added code supporting the new write_protects, * read_protects, and max_read_protects fields. * *------------------------------------------------------------------------- @@ -6831,9 +6831,9 @@ H5C_stats(H5C_t * cache_ptr, += cache_ptr->cache_flush_renames[i]; total_size_increases += cache_ptr->size_increases[i]; total_size_decreases += cache_ptr->size_decreases[i]; - total_entry_flush_size_changes + total_entry_flush_size_changes += cache_ptr->entry_flush_size_changes[i]; - total_cache_flush_size_changes + total_cache_flush_size_changes += cache_ptr->cache_flush_size_changes[i]; total_pins += cache_ptr->pins[i]; total_unpins += cache_ptr->unpins[i]; @@ -6975,14 +6975,14 @@ H5C_stats(H5C_t * cache_ptr, (long)total_flushes, (long)total_evictions); - HDfprintf(stdout, + HDfprintf(stdout, "%s Total insertions(pinned) / renames = %ld(%ld) / %ld\n", cache_ptr->prefix, (long)total_insertions, (long)total_pinned_insertions, (long)total_renames); - HDfprintf(stdout, + HDfprintf(stdout, "%s Total entry / cache flush renames = %ld / %ld\n", cache_ptr->prefix, (long)total_entry_flush_renames, @@ -7164,7 +7164,7 @@ done: * JRM - 3/20/06 * Updated for pin / unpin related statistics. * - * JRM - 8/9/06 + * JRM - 8/9/06 * Further updates for pin related statistics. * * JRM 8/23/06 @@ -7175,7 +7175,7 @@ done: * warning in the production build. * * JRM 3/31/07 - * Added initialization for the new write_protects, + * Added initialization for the new write_protects, * read_protects, and max_read_protects fields. * *------------------------------------------------------------------------- @@ -7406,7 +7406,7 @@ done: * equivalent of setting the H5C__DIRTIED_FLAG. * * JRM -- 3/29/07 - * Modified function to allow a entry to be protected + * Modified function to allow a entry to be protected * more than once if the entry is protected read only. * * Also added sanity checks using the new is_read_only and @@ -7595,10 +7595,10 @@ H5C_unprotect(H5F_t * f, size_increase = new_size - entry_ptr->size; - if ( size_increase >= + if ( size_increase >= cache_ptr->flash_size_increase_threshold ) { - result = H5C__flash_increase_cache_size(cache_ptr, + result = H5C__flash_increase_cache_size(cache_ptr, entry_ptr->size, new_size); @@ -7734,8 +7734,8 @@ H5C_unprotect(H5F_t * f, else if ( clear_entry ) { /* the following first flush flag will never be used as we are - * calling H5C_flush_single_entry with the - * H5C__FLUSH_CLEAR_ONLY_FLAG flag. However, it is needed for + * calling H5C_flush_single_entry with the + * H5C__FLUSH_CLEAR_ONLY_FLAG flag. However, it is needed for * the function call. */ hbool_t dummy_first_flush = TRUE; @@ -8721,8 +8721,8 @@ done: * * Note that this is a pretty bad scenario if it ever * happens. The code I have added should allow us to - * handle the situation under all but the worst conditions, - * but one can argue that I should just scream and die if I + * handle the situation under all but the worst conditions, + * but one can argue that I should just scream and die if I * ever detect the condidtion. * *------------------------------------------------------------------------- @@ -8825,7 +8825,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "*prev_ptr corrupt") - } else + } else #endif /* NDEBUG */ if ( ( prev_ptr->is_dirty != prev_is_dirty ) || @@ -9202,9 +9202,9 @@ done: * Function: H5C__flash_increase_cache_size * * Purpose: If there is not at least new_entry_size - old_entry_size - * bytes of free space in the cache and the current - * max_cache_size is less than (cache_ptr->resize_ctl).max_size, - * perform a flash increase in the cache size and then reset + * bytes of free space in the cache and the current + * max_cache_size is less than (cache_ptr->resize_ctl).max_size, + * perform a flash increase in the cache size and then reset * the full cache hit rate statistics, and exit. * * Return: Non-negative on success/Negative on failure. @@ -9248,13 +9248,13 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr, space_needed = new_entry_size - old_entry_size; - if ( ( (cache_ptr->index_size + space_needed) > + if ( ( (cache_ptr->index_size + space_needed) > cache_ptr->max_cache_size ) && ( cache_ptr->max_cache_size < (cache_ptr->resize_ctl).max_size ) ) { /* we have work to do */ - switch ( (cache_ptr->resize_ctl).flash_incr_mode ) + switch ( (cache_ptr->resize_ctl).flash_incr_mode ) { case H5C_flash_incr__off: HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ @@ -9263,13 +9263,13 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr, case H5C_flash_incr__add_space: if ( cache_ptr->index_size < cache_ptr->max_cache_size ) { - + HDassert( (cache_ptr->max_cache_size - cache_ptr->index_size) < space_needed ); space_needed -= cache_ptr->max_cache_size - cache_ptr->index_size; } - space_needed = - (size_t)(((double)space_needed) * + space_needed = + (size_t)(((double)space_needed) * (cache_ptr->resize_ctl).flash_multiple); new_max_cache_size = cache_ptr->max_cache_size + space_needed; @@ -9324,7 +9324,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr, break; } - /* note that we don't cycle the epoch markers. We can + /* note that we don't cycle the epoch markers. We can * argue either way as to whether we should, but for now * we don't. */ @@ -9418,8 +9418,8 @@ done: * * Note that this is a pretty bad scenario if it ever * happens. The code I have added should allow us to - * handle the situation under all but the worst conditions, - * but one can argue that I should just scream and die if I + * handle the situation under all but the worst conditions, + * but one can argue that I should just scream and die if I * ever detect the condidtion. * * -- JRM 10/13/07 @@ -9481,29 +9481,29 @@ H5C_flush_invalidate_cache(H5F_t * f, /* The flush proceedure here is a bit strange. * - * In the outer while loop we make at least one pass through the + * In the outer while loop we make at least one pass through the * cache, and then repeat until either all the pinned entries * unpin themselves, or until the number of pinned entries stops * declining. In this later case, we scream and die. * * Since the fractal heap can dirty, resize, and/or rename entries * in is flush callback, it is possible that the cache will still - * contain dirty entries at this point. If so, we must make up to - * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list + * contain dirty entries at this point. If so, we must make up to + * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list * to allow it to empty. If is is not empty at this point, we again * scream and die. * - * Further, since clean entries can be dirtied, resized, and/or renamed + * Further, since clean entries can be dirtied, resized, and/or renamed * as the result of a flush call back (either the entries own, or that - * for some other cache entry), we can no longer promise to flush + * for some other cache entry), we can no longer promise to flush * the cache entries in increasing address order. * * Instead, we just do the best we can -- making a pass through - * the skip list, and then a pass through the "clean" entries, and - * then repeating as needed. Thus it is quite possible that an + * the skip list, and then a pass through the "clean" entries, and + * then repeating as needed. Thus it is quite possible that an * entry will be evicted from the cache only to be re-loaded later - * in the flush process (From what Quincey tells me, the pin - * mechanism makes this impossible, but even it it is true now, + * in the flush process (From what Quincey tells me, the pin + * mechanism makes this impossible, but even it it is true now, * we shouldn't count on it in the future.) * * The bottom line is that entries will probably be flushed in close @@ -9520,10 +9520,10 @@ H5C_flush_invalidate_cache(H5F_t * f, have_pinned_entries = ( cur_pel_len > 0 ); /* first, try to flush-destroy any dirty entries. Do this by - * making a scan through the slist. Note that new dirty entries + * making a scan through the slist. Note that new dirty entries * may be created by the flush call backs. Thus it is possible * that the slist will not be empty after we finish the scan. - */ + */ if ( cache_ptr->slist_len == 0 ) { @@ -9619,7 +9619,7 @@ H5C_flush_invalidate_cache(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "entry_ptr->magic is invalid ?!?!"); - } else + } else #endif /* NDEBUG */ if ( ( ! entry_ptr->is_dirty ) || ( ! entry_ptr->in_slist ) ) { @@ -9678,7 +9678,7 @@ H5C_flush_invalidate_cache(H5F_t * f, * cache_ptr->slist_size_increase. * * Note that we include pinned entries in this count, even - * though we will not actually flush them. + * though we will not actually flush them. */ actual_slist_len++; actual_slist_size += entry_ptr->size; @@ -9699,7 +9699,7 @@ H5C_flush_invalidate_cache(H5F_t * f, * as pinned entries can't be evicted. */ if ( TRUE ) { /* When we get to multithreaded cache, - * we will need either locking code, and/or + * we will need either locking code, and/or * a test to see if the entry is in flushable * condition here. */ @@ -9759,18 +9759,18 @@ H5C_flush_invalidate_cache(H5F_t * f, if ( node_ptr == NULL ) { - HDassert( (actual_slist_len + cache_ptr->slist_len) == + HDassert( (actual_slist_len + cache_ptr->slist_len) == (initial_slist_len + cache_ptr->slist_len_increase) ); - HDassert( (actual_slist_size + cache_ptr->slist_size) == + HDassert( (actual_slist_size + cache_ptr->slist_size) == (initial_slist_size + cache_ptr->slist_size_increase) ); } #endif /* H5C_DO_SANITY_CHECKS */ /* Since we are doing a destroy, we must make a pass through * the hash table and try to flush - destroy all entries that - * remain. + * remain. * - * It used to be that all entries remaining in the cache at + * It used to be that all entries remaining in the cache at * this point had to be clean, but with the fractal heap mods * this may not be the case. If so, we will flush entries out * of increasing address order. @@ -9837,9 +9837,9 @@ H5C_flush_invalidate_cache(H5F_t * f, * it never will), and if the cache was full, it is * possible that *next_entry_ptr was flushed or evicted. * - * Test to see if this happened here. Note that if this - * test is triggred, we are accessing a deallocated piece - * of dynamically allocated memory, so we just scream and + * Test to see if this happened here. Note that if this + * test is triggred, we are accessing a deallocated piece + * of dynamically allocated memory, so we just scream and * die. */ #ifndef NDEBUG @@ -9872,7 +9872,7 @@ H5C_flush_invalidate_cache(H5F_t * f, } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) { /* increment the pass count */ - passes++; + passes++; } if ( passes >= H5C__MAX_PASSES_ON_FLUSH ) { @@ -9994,19 +9994,19 @@ done: * as there is no write to file in this case. * * JRM -- 8/21/06 - * Added code maintaining the flush_in_progress and - * destroy_in_progress fields in H5C_cache_entry_t. - * - * Also added flush_flags parameter to the call to - * type_ptr->flush() so that the flush routine can report - * whether the entry has been resized or renamed. Added - * code using the flush_flags variable to detect the case - * in which the target entry is resized during flush, and + * Added code maintaining the flush_in_progress and + * destroy_in_progress fields in H5C_cache_entry_t. + * + * Also added flush_flags parameter to the call to + * type_ptr->flush() so that the flush routine can report + * whether the entry has been resized or renamed. Added + * code using the flush_flags variable to detect the case + * in which the target entry is resized during flush, and * update the caches data structures accordingly. * * * JRM -- 3/29/07 - * Added sanity checks on the new is_read_only and + * Added sanity checks on the new is_read_only and * ro_ref_count fields. * *------------------------------------------------------------------------- @@ -10167,8 +10167,8 @@ H5C_flush_single_entry(H5F_t * f, * entry if destroy is true. * * Note that it is possible that the entry will be renamed during - * its call to flush. This will upset H5C_rename_entry() if we - * don't tell it that it doesn't have to worry about updating the + * its call to flush. This will upset H5C_rename_entry() if we + * don't tell it that it doesn't have to worry about updating the * index and SLIST. Use the destroy_in_progress field for this * purpose. */ @@ -10298,7 +10298,7 @@ H5C_flush_single_entry(H5F_t * f, #ifndef NDEBUG if ( destroy ) { - /* we are about to call the clear callback with the + /* we are about to call the clear callback with the * destroy flag set -- this will result in *entry_ptr * being freed. Set the magic field to bad magic * so we can detect a freed cache entry if we see @@ -10326,7 +10326,7 @@ H5C_flush_single_entry(H5F_t * f, #ifndef NDEBUG if ( destroy ) { - /* we are about to call the flush callback with the + /* we are about to call the flush callback with the * destroy flag set -- this will result in *entry_ptr * being freed. Set the magic field to bad magic * so we can detect a freed cache entry if we see @@ -10366,21 +10366,21 @@ H5C_flush_single_entry(H5F_t * f, * die. * * At present, in the parallel case, the aux_ptr - * will only be set if there is more than one - * process. Thus we can use this to detect + * will only be set if there is more than one + * process. Thus we can use this to detect * the parallel case. * - * This works for now, but if we start using the - * aux_ptr for other purposes, we will have to + * This works for now, but if we start using the + * aux_ptr for other purposes, we will have to * change this test accordingly. * * NB: While this test detects entryies that attempt * to resize or rename themselves during a flush * in the parallel case, it will not detect an - * entry that dirties, resizes, and/or renames + * entry that dirties, resizes, and/or renames * other entries during its flush. * - * From what Quincey tells me, this test is + * From what Quincey tells me, this test is * sufficient for now, as any flush routine that * does the latter will also do the former. * @@ -10415,7 +10415,7 @@ H5C_flush_single_entry(H5F_t * f, /* The entry size changed as a result of the flush. * - * Most likely, the entry was compressed, and the + * Most likely, the entry was compressed, and the * new version is of a different size than the old. * * In any case, we must update entry and cache size @@ -10423,7 +10423,7 @@ H5C_flush_single_entry(H5F_t * f, */ size_t new_size; - if ( (entry_ptr->type->size)(f, (void *)entry_ptr, &new_size) + if ( (entry_ptr->type->size)(f, (void *)entry_ptr, &new_size) < 0 ) { HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGETSIZE, FAIL, \ @@ -10440,14 +10440,14 @@ H5C_flush_single_entry(H5F_t * f, (new_size)); /* The entry can't be protected since we just flushed it. - * Thus we must update the replacement policy data - * structures for the size change. The macro deals + * Thus we must update the replacement policy data + * structures for the size change. The macro deals * with the pinned case. */ H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, \ new_size) - /* The entry can't be in the slist, so no need to update + /* The entry can't be in the slist, so no need to update * the slist for the size change. */ @@ -10465,12 +10465,12 @@ H5C_flush_single_entry(H5F_t * f, /* The entry was renamed as the result of the flush. * - * Most likely, the entry was compressed, and the - * new version is larger than the old and thus had + * Most likely, the entry was compressed, and the + * new version is larger than the old and thus had * to be relocated. * - * At preset, all processing for this case is - * handled elsewhere. But lets keep the if statement + * At preset, all processing for this case is + * handled elsewhere. But lets keep the if statement * around just in case. */ @@ -10522,7 +10522,7 @@ done: * * JRM - 6/23/06 * Deleted assertion that verified that a newly loaded - * entry is clean. Due to a bug fix, this need not be + * entry is clean. Due to a bug fix, this need not be * the case, as our code will attempt to repair errors * on load. * @@ -10531,7 +10531,7 @@ done: * destroy in progress fields. * * JRM - 3/29/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * *------------------------------------------------------------------------- @@ -10571,10 +10571,10 @@ H5C_load_entry(H5F_t * f, entry_ptr = (H5C_cache_entry_t *)thing; /* In general, an entry should be clean just after it is loaded. - * + * * However, when this code is used in the metadata cache, it is - * possible that object headers will be dirty at this point, as - * the load function will alter object headers if necessary to + * possible that object headers will be dirty at this point, as + * the load function will alter object headers if necessary to * fix an old bug. * * To support this bug fix, I have replace the old assert: @@ -10588,7 +10588,7 @@ H5C_load_entry(H5F_t * f, * Note that type id 4 is associated with object headers in the metadata * cache. * - * When we get to using H5C for other purposes, we may wish to + * When we get to using H5C for other purposes, we may wish to * tighten up the assert so that the loophole only applies to the * metadata cache. */ @@ -10691,7 +10691,7 @@ done: * min clean size before the cache has filled. * * JRM -- 3/29/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields. * * JRM -- 10/13/07 @@ -10705,8 +10705,8 @@ done: * * Note that this is a pretty bad scenario if it ever * happens. The code I have added should allow us to - * handle the situation under all but the worst conditions, - * but one can argue that I should just scream and die if I + * handle the situation under all but the worst conditions, + * but one can argue that I should just scream and die if I * ever detect the condidtion. * *------------------------------------------------------------------------- @@ -10823,7 +10823,7 @@ H5C_make_space_in_cache(H5F_t * f, } #endif /* NDEBUG */ if ( entry_is_epoch_maker ) { - + entry_ptr = prev_ptr; } else if ( ( prev_ptr->is_dirty != prev_is_dirty ) @@ -10918,7 +10918,7 @@ H5C_make_space_in_cache(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "*prev_ptr corrupt 2") - } else + } else #endif /* #ifndef NDEBUG */ if ( ( ! ( prev_ptr->is_dirty ) ) || @@ -258,7 +258,7 @@ const H5C2_class_t epoch_marker_class_2 = /* serialize = */ &H5C2_epoch_marker_serialize, /* free_icr = */ &H5C2_epoch_marker_free_icr, /* clear_dirty_bits = */ &H5C2_epoch_marker_clear_dirty_bits, -}; +}; /*************************************************************************** @@ -303,7 +303,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } -static herr_t +static herr_t H5C2_epoch_marker_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, @@ -423,18 +423,18 @@ done: * * JRM -- 8/25/06 * Added initialization for the slist_len_increase and - * slist_size_increase fields. These fields are used + * slist_size_increase fields. These fields are used * for sanity checking in the flush process, and are not * compiled in unless H5C2_DO_SANITY_CHECKS is TRUE. * * JRM -- 3/28/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * * JRM -- 7/10/07 - * Added the f parameter, along with initialization of + * Added the f parameter, along with initialization of * the field of the same in in H5C2_t. Also removed the - * type name table, as type names are now included in + * type name table, as type names are now included in * instances of H5C2_class_t. * * JRM -- 3/28/07 @@ -446,19 +446,19 @@ done: * related fields of H5C2_t. * * JRM -- 3/6/08 - * Added initialization for metadata journaling related + * Added initialization for metadata journaling related * fields in H5C2_t. * * JRM -- 3/26/08 * Added dxpl_id and journal_recovered parameters. Also * added code to test to see if the file is marked as having - * journaling in progress, and fail if it does unless + * journaling in progress, and fail if it does unless * the journal_recovered parameter is TRUE. * * JRM -- 7/10/08 * Removed the f, dxpl_id, and journal_recovered parameters, * as checking for journaling in progress is no longer handled - * in H5C2_create(). + * in H5C2_create(). * *------------------------------------------------------------------------- */ @@ -621,7 +621,7 @@ H5C2_create(size_t max_cache_size, { (cache_ptr->epoch_marker_active)[i] = FALSE; #ifndef NDEBUG - ((cache_ptr->epoch_markers)[i]).magic = + ((cache_ptr->epoch_markers)[i]).magic = H5C2__H5C2_CACHE_ENTRY_T_MAGIC; #endif /* NDEBUG */ ((cache_ptr->epoch_markers)[i]).addr = (haddr_t)i; @@ -659,7 +659,7 @@ H5C2_create(size_t max_cache_size, cache_ptr->jnl_magic = 0; cache_ptr->jnl_file_name_len = 0; (cache_ptr->jnl_file_name)[0] = '\0'; - (cache_ptr->mdj_jbrb).magic = + (cache_ptr->mdj_jbrb).magic = H5C2__H5C2_JBRB_T_MAGIC; cache_ptr->tl_len = 0; cache_ptr->tl_size = 0; @@ -670,12 +670,12 @@ H5C2_create(size_t max_cache_size, cache_ptr->jwipl_head_ptr = NULL; cache_ptr->jwipl_tail_ptr = NULL; - /* allocate and initialze the metadata journaling status change + /* allocate and initialze the metadata journaling status change * callback table, along with the associated fields. Note that * the table will grow and shrink as needed. */ - cache_ptr->mdjsc_cb_tbl = - H5MM_malloc(H5C2__MIN_MDJSC_CB_TBL_LEN * + cache_ptr->mdjsc_cb_tbl = + H5MM_malloc(H5C2__MIN_MDJSC_CB_TBL_LEN * sizeof(H5C2_mdjsc_record_t)); if ( cache_ptr->mdjsc_cb_tbl == NULL ) { @@ -708,14 +708,14 @@ H5C2_create(size_t max_cache_size, cache_ptr->skip_dxpl_id_checks = FALSE; cache_ptr->prefix[0] = '\0'; /* empty string */ - /* We used to check for journaling here, but the super block hasn't - * been read in yet at cache creation time -- thus the check for - * journaling has been moved to H5AC2_check_for_journaling(), which + /* We used to check for journaling here, but the super block hasn't + * been read in yet at cache creation time -- thus the check for + * journaling has been moved to H5AC2_check_for_journaling(), which * is simply a wrapper for H5C2_check_for_journaling(). * * H5AC2_check_for_journaling() is called at the end of H5Fopen() -- * at which point the superblock has been read. - * + * * Note that H5Fopen() is called by both H5Fcreate() and H5Fopen(). */ @@ -964,8 +964,8 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr, * * JRM -- 7/11/07 * Reworked parameter list for the revised cache API. - * The function lost its pointer to an instance of - * H5F_t (now supplied via cache_ptr), and one of its + * The function lost its pointer to an instance of + * H5F_t (now supplied via cache_ptr), and one of its * dxlp ids. * *------------------------------------------------------------------------- @@ -1088,8 +1088,8 @@ done: * * Function: H5C2_expunge_entry * - * Purpose: Use this function to tell the cache to expunge an entry - * from the cache without writing it to disk even if it is + * Purpose: Use this function to tell the cache to expunge an entry + * from the cache without writing it to disk even if it is * dirty. The entry may not be either pinned or protected. * * Return: Non-negative on success/Negative on failure @@ -1101,11 +1101,11 @@ done: * * JRM -- 7/11/07 * Reworked the parameter list for the revised cache API. - * The function lost its file pointer (now passed in the + * The function lost its file pointer (now passed in the * *cache_ptr), and one of the dxpl ids. * * JRM -- 4/3/08 - * Added code to test to see if journaling is enabled, and + * Added code to test to see if journaling is enabled, and * if it is, test to see if entry_ptr->last_trans > zero. * If so, must remove the entry from the transaction list * (if it is present), remove the entry from the journal @@ -1132,7 +1132,7 @@ H5C2_expunge_entry(H5F_t * f, #if H5C2_PRINT_ENTRY_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", + HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, (unsigned long)addr, type->name); } #endif /* H5C2_PRINT_ENTRY_POINTS */ @@ -1200,7 +1200,7 @@ H5C2_expunge_entry(H5F_t * f, } } - /* If we get this far, call H5C2_flush_single_entry() with the + /* If we get this far, call H5C2_flush_single_entry() with the * H5C2__FLUSH_INVALIDATE_FLAG and the H5C2__FLUSH_CLEAR_ONLY_FLAG. * This will clear the entry, and then delete it from the cache. */ @@ -1210,7 +1210,7 @@ H5C2_expunge_entry(H5F_t * f, cache_ptr, entry_ptr->type, entry_ptr->addr, - H5C2__FLUSH_INVALIDATE_FLAG | + H5C2__FLUSH_INVALIDATE_FLAG | H5C2__FLUSH_CLEAR_ONLY_FLAG, TRUE); @@ -1232,7 +1232,7 @@ done: #if H5C2_PRINT_EXIT_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: Exiting with result = %d.\n", + HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value); } #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -1314,31 +1314,31 @@ done: * Updated function to handle pinned entries. * * JRM -- 8/19/06 - * Added code managing the new flush_in_progress field of + * Added code managing the new flush_in_progress field of * H5C2_t. * * Also reworked function to allow for the possibility that * entries will be dirtied, resized, or renamed during flush - * callbacks. As a result, we may have to make multiple + * callbacks. As a result, we may have to make multiple * passes through the skip list before the cache is flushed. * * JRM -- 7/11/07 * Reworked function to support the new metadata cache API. - * The function lost the H5F_t parameter (now passed via + * The function lost the H5F_t parameter (now passed via * *cache_ptr), and one of the dxpl id parameters. * * JRM -- 10/13/07 - * Added code to detect and manage the case in which a + * Added code to detect and manage the case in which a * serialize callback changes the s-list out from under * the function. The only way I can think of in which this * can happen is if a serialize function loads an entry * into the cache that isn't there already. Quincey tells - * me that this will never happen, but I'm not sure I + * me that this will never happen, but I'm not sure I * believe him. * - * Note that this is a pretty bad scenario if it ever - * happens. The code I have added should allow us to - * handle the situation, but one can argue that I should + * Note that this is a pretty bad scenario if it ever + * happens. The code I have added should allow us to + * handle the situation, but one can argue that I should * just scream and die if I ever detect the condidtion. * * JRM -- 10/13/07 @@ -1357,7 +1357,7 @@ done: * ever detect the condidtion. * * JRM -- 4/10/08 - * Added code to support journaling. + * Added code to support journaling. * *------------------------------------------------------------------------- */ @@ -1469,7 +1469,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) "next_entry_ptr == NULL 1 ?!?!"); } #ifndef NDEBUG - HDassert( next_entry_ptr->magic == + HDassert( next_entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ); #endif /* NDEBUG */ HDassert( next_entry_ptr->is_dirty ); @@ -1480,7 +1480,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) next_entry_ptr = NULL; } - + HDassert( node_ptr != NULL ); #if H5C2_DO_SANITY_CHECKS @@ -1495,7 +1495,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) * fractal heap, the entry serialize callback can cause entries * to be dirtied, resized, and/or renamed. * - * To deal with this, we first make note of the initial + * To deal with this, we first make note of the initial * skip list length and size: */ initial_slist_len = cache_ptr->slist_len; @@ -1507,12 +1507,12 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) flushed_entries_count = 0; flushed_entries_size = 0; - /* As mentioned above, there is the possibility that + /* As mentioned above, there is the possibility that * entries will be dirtied, resized, and/or flushed during - * our pass through the skip list. To capture the number - * of entries added, and the skip list size delta, + * our pass through the skip list. To capture the number + * of entries added, and the skip list size delta, * zero the slist_len_increase and slist_size_increase of - * the cache's instance of H5C2_t. These fields will be + * the cache's instance of H5C2_t. These fields will be * updated elsewhere to account for slist insertions and/or * dirty entry size changes. */ @@ -1533,18 +1533,18 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) * that the serialize callback will dirty and/or resize * other entries in the cache. In particular, while * Quincey has promised me that this will never happen, - * it is possible that the serialize callback for an + * it is possible that the serialize callback for an * entry may protect an entry that is not in the cache, - * perhaps causing the cache to flush and possibly + * perhaps causing the cache to flush and possibly * evict the entry associated with node_ptr to make * space for the new entry. * * Thus we do a bit of extra sanity checking on entry_ptr, - * and break out of this scan of the skip list if we - * detect minor problems. We have a bit of leaway on the - * number of passes though the skip list, so this shouldn't - * be an issue in the flush in and of itself, as it should - * be all but impossible for this to happen more than once + * and break out of this scan of the skip list if we + * detect minor problems. We have a bit of leaway on the + * number of passes though the skip list, so this shouldn't + * be an issue in the flush in and of itself, as it should + * be all but impossible for this to happen more than once * in any flush. * * Observe that that breaking out of the scan early @@ -1554,7 +1554,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) * If an entry has merely been marked clean and removed from * the s-list, we simply break out of the scan. * - * If the entry has been evicted, we flag an error and + * If the entry has been evicted, we flag an error and * exit. */ #ifndef NDEBUG @@ -1563,12 +1563,12 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "entry_ptr->magic invalid ?!?!"); - } else + } else #endif /* NDEBUG */ if ( ( ! entry_ptr->is_dirty ) || ( ! entry_ptr->in_slist ) ) { - /* the s-list has been modified out from under us. + /* the s-list has been modified out from under us. * set node_ptr to NULL and break out of the loop. */ node_ptr = NULL; @@ -1590,7 +1590,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) "next_entry_ptr == NULL 2 ?!?!"); } #ifndef NDEBUG - HDassert( next_entry_ptr->magic == + HDassert( next_entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ); #endif /* NDEBUG */ HDassert( next_entry_ptr->is_dirty ); @@ -1602,7 +1602,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) HDassert( entry_ptr != NULL ); HDassert( entry_ptr->in_slist ); - if ( ( ! flush_marked_entries ) || + if ( ( ! flush_marked_entries ) || ( entry_ptr->flush_marker ) ) { if ( entry_ptr->is_protected ) { @@ -1617,13 +1617,13 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) } else if ( entry_ptr->is_pinned ) { /* Test to see if we are can flush the entry now. - * If we can, go ahead and flush. Note that we - * aren't trying to do a destroy here, so that + * If we can, go ahead and flush. Note that we + * aren't trying to do a destroy here, so that * is not an issue. */ if ( TRUE ) { /* When we get to multithreaded cache, - * we will need either locking code, - * and/or a test to see if the entry + * we will need either locking code, + * and/or a test to see if the entry * is in flushable condition here. */ #if H5C2_DO_SANITY_CHECKS @@ -1639,7 +1639,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) FALSE); if ( status < 0 ) { - /* This shouldn't happen -- if it does, we + /* This shouldn't happen -- if it does, we * are toast so just scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ @@ -1661,7 +1661,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) FALSE); if ( status < 0 ) { - /* This shouldn't happen -- if it does, we are + /* This shouldn't happen -- if it does, we are * toast so just scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ @@ -1675,7 +1675,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) #if H5C2_DO_SANITY_CHECKS /* Verify that the slist size and length are as expected. */ - HDassert( (initial_slist_len + cache_ptr->slist_len_increase - + HDassert( (initial_slist_len + cache_ptr->slist_len_increase - flushed_entries_count) == cache_ptr->slist_len ); HDassert( (initial_slist_size + cache_ptr->slist_size_increase - flushed_entries_size) == cache_ptr->slist_size ); @@ -1714,7 +1714,7 @@ H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) if ( cache_ptr->mdj_enabled ) { - status = H5C2_journal_post_flush(f, dxpl_id, cache_ptr, + status = H5C2_journal_post_flush(f, dxpl_id, cache_ptr, (hbool_t)(flush_marked_entries == FALSE)); if ( status != SUCCEED ) { @@ -1729,7 +1729,7 @@ done: cache_ptr->flush_in_progress = FALSE; #if H5C2_PRINT_EXIT_POINTS - HDfprintf(stdout, "%s: Exiting with result = %d.\n", + HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value); #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -1783,13 +1783,13 @@ done: * find a case where it helps, lets get rid of it. * * - * Added some sanity checks to the change which verify the + * Added some sanity checks to the change which verify the * expected values of the new is_read_only and ro_ref_count * fields. * JRM - 3/29/07 * * Modified parameter list for the new metadata cache API. - * THe function lost its H5F_t parameter (now passed via + * THe function lost its H5F_t parameter (now passed via * *cache_ptr), and one of its dxpl ids. * * JRM - 7/11/07 @@ -2269,7 +2269,7 @@ H5C2_get_evictions_enabled(const H5C2_t * cache_ptr, FUNC_ENTER_NOAPI(H5C2_get_evictions_enabled, FAIL) - if ( ( cache_ptr == NULL ) || + if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.") @@ -2296,7 +2296,7 @@ done: * Purpose: Get the trace_file_ptr field from the cache. * * This field will either be NULL (which indicates that trace - * file logging is turned off), or contain a pointer to the + * file logging is turned off), or contain a pointer to the * open file to which trace file data is to be written. * * Return: Non-negative on success/Negative on failure @@ -2327,7 +2327,7 @@ H5C2_get_trace_file_ptr(const H5C2_t *cache_ptr, FILE **trace_file_ptr_ptr) * Purpose: Get the trace_file_ptr field from the cache, via an entry. * * This field will either be NULL (which indicates that trace - * file logging is turned off), or contain a pointer to the + * file logging is turned off), or contain a pointer to the * open file to which trace file data is to be written. * * Return: Non-negative on success/Negative on failure @@ -2421,13 +2421,13 @@ H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr, * destroy_in_progress fields. * * JRM -- 3/29/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * * JRM -- 7/11/07 - * Reworked the parameter list for the revised metadata + * Reworked the parameter list for the revised metadata * cache API. The function lost its pointer to H5F_t - * (now supplied via *cache_ptr), and one of dxpl id + * (now supplied via *cache_ptr), and one of dxpl id * parameters. It gained a entry length parameter. * Numerous internal changes to support the API change. * @@ -2471,10 +2471,10 @@ H5C2_insert_entry(H5F_t * f, FUNC_ENTER_NOAPI(H5C2_insert_entry, FAIL) -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: addr = 0x%lX, len = %d, type = %s.\n", FUNC, + HDfprintf(stdout, "%s: addr = 0x%lX, len = %d, type = %s.\n", FUNC, (unsigned long)addr, (int)len, type->name); } #endif /* JRM */ @@ -2487,7 +2487,7 @@ H5C2_insert_entry(H5F_t * f, HDassert( cache_ptr ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); HDassert( cache_ptr->skip_file_checks || f ); - HDassert( ( ! ( cache_ptr->mdj_enabled ) ) || + HDassert( ( ! ( cache_ptr->mdj_enabled ) ) || ( cache_ptr->trans_in_progress ) ); HDassert( type ); HDassert( H5F_addr_defined(addr) ); @@ -2559,7 +2559,7 @@ H5C2_insert_entry(H5F_t * f, if ( ( cache_ptr->flash_size_increase_possible ) && ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) { - result = H5C2__flash_increase_cache_size(cache_ptr, 0, + result = H5C2__flash_increase_cache_size(cache_ptr, 0, entry_ptr->size); if ( result < 0 ) { @@ -2715,7 +2715,7 @@ done: #if H5C2_PRINT_EXIT_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: Exiting with result = %d.\n", + HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value); } #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -2771,20 +2771,20 @@ done: * * JRM -- 7/11/07 * Revised function for the new metadata cache API. The - * function lost its point to H5F_t (now supplied via + * function lost its point to H5F_t (now supplied via * *cache_ptr), and one of its dxpl ids. Also internal * changes supporting the revised API. * * JRM -- 10/13/07 * Didn't modify this function to detect the case in which * the LRU is modified out from under it. It shouldn't be - * an issue here, as this function is only called in the + * an issue here, as this function is only called in the * parallel case, and serialize callbacks must not modify * other entries in parallel case. If they do, they will * cause inconsistancies in metadata across processes. * - * Further, since this function only clears entries, and - * thus the serialize functions are never called, the + * Further, since this function only clears entries, and + * thus the serialize functions are never called, the * situation will be even worse, as the changes will only * exist on process 0. * @@ -3091,11 +3091,11 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size) HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC); HDassert((!cache_ptr->mdj_enabled) || cache_ptr->trans_in_progress); -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id)) - HDfprintf(stdout, - "%s: addr = 0x%lX, size_changed = %d, new_size = %d.\n", - FUNC, (unsigned long)(entry_ptr->addr), (int)size_changed, + HDfprintf(stdout, + "%s: addr = 0x%lX, size_changed = %d, new_size = %d.\n", + FUNC, (unsigned long)(entry_ptr->addr), (int)size_changed, (int)new_size); #endif /* JRM */ @@ -3147,7 +3147,7 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size) (new_size)); } - /* if journaling is enabled, and the entry is already in the + /* if journaling is enabled, and the entry is already in the * transaction list, update that list for the size change as well. */ H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \ @@ -3166,8 +3166,8 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size) H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL) } - /* if journaling is enabled, check to see if the entry is in the - * transaction list. If it isn't, insert it. If it is, move it to + /* if journaling is enabled, check to see if the entry is in the + * transaction list. If it isn't, insert it. If it is, move it to * the head of the list. */ H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL) @@ -3223,9 +3223,9 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing) HDassert(cache_ptr); HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC); -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id)) - HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, + HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, (unsigned long)(entry_ptr->addr), entry_ptr->type->name); #endif /* JRM */ @@ -3237,7 +3237,7 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing) entry_ptr->dirtied = TRUE; /* don't do anything with the transaction list now, as the - * entry will be added to the transaction list when it is + * entry will be added to the transaction list when it is * unprotected. */ @@ -3319,14 +3319,14 @@ done: * modification is now obsolete. * * JRM -- 3/31/08 - * Updated function to check if journaling is enabled. If - * it is, the function now inserts the renamed entry in the + * Updated function to check if journaling is enabled. If + * it is, the function now inserts the renamed entry in the * transaction list (if it wasn't there already). * - * Also added sanity checks that will scream and die if + * Also added sanity checks that will scream and die if * we attempt to rename an entry during either a destroy - * or flush if journaling is enabled. Recall that any - * rename should have already been triggered when the + * or flush if journaling is enabled. Recall that any + * rename should have already been triggered when the * entry was serialized to construct its journal entry. * *------------------------------------------------------------------------- @@ -3349,11 +3349,11 @@ H5C2_rename_entry(H5C2_t * cache_ptr, FUNC_ENTER_NOAPI(H5C2_rename_entry, FAIL) -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: type = %s, old_addr = 0x%lX, new_addr = 0x%lx.\n", - FUNC, type->name, (unsigned long)old_addr, + HDfprintf(stdout, "%s: type = %s, old_addr = 0x%lX, new_addr = 0x%lx.\n", + FUNC, type->name, (unsigned long)old_addr, (unsigned long)new_addr); } #endif /* JRM */ @@ -3390,14 +3390,14 @@ H5C2_rename_entry(H5C2_t * cache_ptr, "Target entry is protected.") } - if ( ( entry_ptr->destroy_in_progress ) && + if ( ( entry_ptr->destroy_in_progress ) && ( cache_ptr->mdj_enabled ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "rename on destroy when journaling is enabled.\n"); } - if ( ( entry_ptr->flush_in_progress ) && + if ( ( entry_ptr->flush_in_progress ) && ( cache_ptr->mdj_enabled ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ @@ -3432,7 +3432,7 @@ H5C2_rename_entry(H5C2_t * cache_ptr, * Since this is a simple re-name, cache size should be unaffected. * * Check to see if the target entry is in the process of being destroyed - * before we delete from the index, etc. If it is, all we do is + * before we delete from the index, etc. If it is, all we do is * change the addr. If the entry is only in the process of being flushed, * don't mark it as dirty either, lest we confuse the flush call back. */ @@ -3478,7 +3478,7 @@ H5C2_rename_entry(H5C2_t * cache_ptr, if ( removed_entry_from_slist ) { - /* we just removed the entry from the slist. Thus we + /* we just removed the entry from the slist. Thus we * must touch up cache_ptr->slist_len_increase and * cache_ptr->slist_size_increase to keep from skewing * the sanity checks. @@ -3522,7 +3522,7 @@ done: #if H5C2_PRINT_EXIT_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: Exiting with result = %d.\n", + HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value); } #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -3538,8 +3538,8 @@ done: * Purpose: Resize a pinned entry. The target entry MUST be * be pinned, and MUST not be unprotected. * - * Resizing an entry dirties it, so if the entry is not - * already dirty, the function places the entry on the + * Resizing an entry dirties it, so if the entry is not + * already dirty, the function places the entry on the * skip list. * * Return: Non-negative on success/Negative on failure @@ -3567,10 +3567,10 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size) HDassert(cache_ptr); HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC); -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id)) - HDfprintf(stdout, "%s: type = %s, addr = 0x%lX, new_size = %d.\n", - FUNC, entry_ptr->type->name, (unsigned long)(entry_ptr->addr), + HDfprintf(stdout, "%s: type = %s, addr = 0x%lX, new_size = %d.\n", + FUNC, entry_ptr->type->name, (unsigned long)(entry_ptr->addr), (int)new_size); #endif /* JRM */ @@ -3582,8 +3582,8 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size) if(entry_ptr->is_protected) HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "Entry is protected??") - /* resizing dirties entries -- mark the entry as dirty if it - * isn't already + /* resizing dirties entries -- mark the entry as dirty if it + * isn't already */ entry_ptr->is_dirty = TRUE; entry_ptr->image_up_to_date = FALSE; @@ -3634,7 +3634,7 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size) (new_size)); } - /* if journaling is enabled, and the entry is already in the + /* if journaling is enabled, and the entry is already in the * transaction list, update that list for the size change as well. */ H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \ @@ -3654,8 +3654,8 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size) H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL) } - /* if journaling is enabled, check to see if the entry is in the - * transaction list. If it isn't, insert it. If it is, move it to + /* if journaling is enabled, check to see if the entry is in the + * transaction list. If it isn't, insert it. If it is, move it to * the head of the list. */ H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL) @@ -3694,9 +3694,9 @@ H5C2_pin_protected_entry(void *thing) FUNC_ENTER_NOAPI(H5C2_pin_protected_entry, FAIL) -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id)) - HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, + HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, (unsigned long)(entry_ptr->addr), entry_ptr->type->name); #endif /* JRM */ @@ -3772,8 +3772,8 @@ done: * make space in the cache. * * JRM -- 11/12/04 - * Added code to call to H5C2_make_space_in_cache() - * after the call to H5C2__auto_adjust_cache_size() if that + * Added code to call to H5C2_make_space_in_cache() + * after the call to H5C2__auto_adjust_cache_size() if that * function sets the size_decreased flag is TRUE. * * JRM -- 4/25/05 @@ -3794,12 +3794,12 @@ done: * * JRM -- 6/23/06 * Modified code to allow dirty entries to be loaded from - * disk. This is necessary as a bug fix in the object + * disk. This is necessary as a bug fix in the object * header code requires us to modify a header as it is read. * * JRM -- 3/28/07 * Added the flags parameter and supporting code. At least - * for now, this parameter is used to allow the entry to + * for now, this parameter is used to allow the entry to * be protected read only, thus allowing multiple protects. * * Also added code to allow multiple read only protects @@ -3811,9 +3811,9 @@ done: * * JRM -- 7/11/07 * Revised function for the new metadata cache API. The - * function lost its point to H5F_t (now supplied via + * function lost its point to H5F_t (now supplied via * *cache_ptr), one of its dxpl ids. and one of the udata - * fields. Gained the len parameter. Also internal + * fields. Gained the len parameter. Also internal * changes supporting the revised API. * * JRM -- 1/3/08 @@ -3821,8 +3821,8 @@ done: * when a large entry is loaded. * * JRM 3/31/08 - * Updated function to insert the newly protected entry in - * the transaction list if journaling is enabled and the + * Updated function to insert the newly protected entry in + * the transaction list if journaling is enabled and the * entry was dirtied on load. * *------------------------------------------------------------------------- @@ -3851,11 +3851,11 @@ H5C2_protect(H5F_t * f, FUNC_ENTER_NOAPI(H5C2_protect, NULL) -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, - "%s: addr = 0x%lX, len = %d, type = %s, flags = 0x%x.\n", + HDfprintf(stdout, + "%s: addr = 0x%lX, len = %d, type = %s, flags = 0x%x.\n", FUNC, (unsigned long)addr, (int)len, type->name, flags); } #endif /* JRM */ @@ -3892,11 +3892,11 @@ H5C2_protect(H5F_t * f, if ( entry_ptr != NULL ) { - hit = TRUE; - thing = (void *)entry_ptr; - - } else { - + hit = TRUE; + thing = (void *)entry_ptr; + + } else { + /* must try to load the entry from disk. */ hit = FALSE; @@ -3926,8 +3926,8 @@ H5C2_protect(H5F_t * f, } } - /* try to free up some space if necessary and if - * evictions are permitted + /* try to free up some space if necessary and if + * evictions are permitted */ if ( ( cache_ptr->evictions_enabled ) && ( (cache_ptr->index_size + entry_ptr->size) > @@ -3989,7 +3989,7 @@ H5C2_protect(H5F_t * f, * for the cache to grow without bound. * * Third, the user may choose to disable evictions -- causing - * the cache to grow without bound until evictions are + * the cache to grow without bound until evictions are * re-enabled. * * Finally, we usually don't check to see if the cache is @@ -3997,7 +3997,7 @@ H5C2_protect(H5F_t * f, * possible to have a vastly oversized cache with no protected * entries as long as all the protects preceed the unprotects. * - * Since items 1, 2, and 3 are not changing any time soon, I + * Since items 1, 2, and 3 are not changing any time soon, I * see no point in worrying about the fourth. */ @@ -4025,7 +4025,7 @@ H5C2_protect(H5F_t * f, } /* under rare (we hope) circumstances, the load routine will - * modify an entry as it loads it to repair corruption from + * modify an entry as it loads it to repair corruption from * a previous version of the library. If this happens, we must * place the entry on the transaction list. */ @@ -4040,8 +4040,8 @@ H5C2_protect(H5F_t * f, * code. If we do this often enough, we may want to optimize this. * * Note that we used to do an update for insertion here, but - * that confused the journaling code -- the update for load is - * just a simplified version of update for insertion that + * that confused the journaling code -- the update for load is + * just a simplified version of update for insertion that * avoids the problem. */ @@ -4054,7 +4054,7 @@ H5C2_protect(H5F_t * f, if ( entry_ptr->is_protected ) { if ( ( read_only ) && ( entry_ptr->is_read_only ) ) { - + HDassert( entry_ptr->ro_ref_count > 0 ); (entry_ptr->ro_ref_count)++; @@ -4150,7 +4150,7 @@ H5C2_protect(H5F_t * f, result = H5C2_make_space_in_cache(f, dxpl_id, cache_ptr, - (size_t)0, + (size_t)0, write_permitted); if ( result < 0 ) { @@ -4174,7 +4174,7 @@ done: #if H5C2_PRINT_EXIT_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: Exiting with result = 0x%lX.\n", + HDfprintf(stdout, "%s: Exiting with result = 0x%lX.\n", FUNC, (unsigned long)ret_value); } #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -4747,8 +4747,8 @@ done: * JRM -- 8/23/06 * Added code supporting new flush related statistics. * - * JRM -- 3/31/07 - * Added code supporting the new write_protects, + * JRM -- 3/31/07 + * Added code supporting the new write_protects, * read_protects, and max_read_protects fields. * *------------------------------------------------------------------------- @@ -4835,9 +4835,9 @@ H5C2_stats(H5C2_t * cache_ptr, += cache_ptr->cache_flush_renames[i]; total_size_increases += cache_ptr->size_increases[i]; total_size_decreases += cache_ptr->size_decreases[i]; - total_entry_flush_size_changes + total_entry_flush_size_changes += cache_ptr->entry_flush_size_changes[i]; - total_cache_flush_size_changes + total_cache_flush_size_changes += cache_ptr->cache_flush_size_changes[i]; total_pins += cache_ptr->pins[i]; total_unpins += cache_ptr->unpins[i]; @@ -4979,14 +4979,14 @@ H5C2_stats(H5C2_t * cache_ptr, (long)total_flushes, (long)total_evictions); - HDfprintf(stdout, + HDfprintf(stdout, "%s Total insertions(pinned) / renames = %ld(%ld) / %ld\n", cache_ptr->prefix, (long)total_insertions, (long)total_pinned_insertions, (long)total_renames); - HDfprintf(stdout, + HDfprintf(stdout, "%s Total entry / cache flush renames = %ld / %ld\n", cache_ptr->prefix, (long)total_entry_flush_renames, @@ -5168,7 +5168,7 @@ done: * JRM - 3/20/06 * Updated for pin / unpin related statistics. * - * JRM - 8/9/06 + * JRM - 8/9/06 * Further updates for pin related statistics. * * JRM 8/23/06 @@ -5179,7 +5179,7 @@ done: * warning in the production build. * * JRM 3/31/07 - * Added initialization for the new write_protects, + * Added initialization for the new write_protects, * read_protects, and max_read_protects fields. * *------------------------------------------------------------------------- @@ -5412,7 +5412,7 @@ done: * equivalent of setting the H5C2__DIRTIED_FLAG. * * JRM -- 3/29/07 - * Modified function to allow a entry to be protected + * Modified function to allow a entry to be protected * more than once if the entry is protected read only. * * Also added sanity checks using the new is_read_only and @@ -5420,8 +5420,8 @@ done: * * JRM -- 9/8/07 * Revised function for the new metadata cache API. The - * function lost its pointer to H5F_t (now supplied via - * *cache_ptr), and one of its dxpl ids. Also internal + * function lost its pointer to H5F_t (now supplied via + * *cache_ptr), and one of its dxpl ids. Also internal * changes supporting the revised API. * * JRM -- 12/31/07 @@ -5457,11 +5457,11 @@ H5C2_unprotect(H5F_t * f, FUNC_ENTER_NOAPI(H5C2_unprotect, FAIL) -#if H5C2_PRINT_ENTRY_POINTS +#if H5C2_PRINT_ENTRY_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, - "%s: addr = 0x%lX, type = %s, flags = 0x%x, new_size = %d.\n", + HDfprintf(stdout, + "%s: addr = 0x%lX, type = %s, flags = 0x%x, new_size = %d.\n", FUNC, (unsigned long)addr, type->name, flags, (int)new_size); } #endif /* JRM */ @@ -5524,7 +5524,7 @@ H5C2_unprotect(H5F_t * f, HDassert( entry_ptr->is_read_only ); if ( dirtied ) { - + HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \ "Read only entry modified(1)??") } @@ -5839,7 +5839,7 @@ done: #if H5C2_PRINT_EXIT_POINTS if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) { - HDfprintf(stdout, "%s: Exiting with result = %d.\n", + HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value); } #endif /* H5C2_PRINT_EXIT_POINTS */ @@ -6144,10 +6144,10 @@ done: * H5C2_auto_size_ctl_t structure. * * JRM -- 9/8/07 - * Reworked to accomodate cache API changes needed to + * Reworked to accomodate cache API changes needed to * support metadata journaling. Mostly, this involved - * removing a bunch of parameters that used to be - * passed through to other calls, and are no longer + * removing a bunch of parameters that used to be + * passed through to other calls, and are no longer * needed. * * JRM -- 1/5/08 @@ -6509,7 +6509,7 @@ done: * JRM -- 9/9/07 * Reworked function to support API changes in support of * metadata cacheing. In essence, the change involved - * removal of arguments that are no longer needed by the + * removal of arguments that are no longer needed by the * callbacks, and thus no-longer need be passed through. * *------------------------------------------------------------------------- @@ -6780,7 +6780,7 @@ done: * JRM -- 9/9/07 * Reworked function to support API changes in support of * metadata cacheing. In essence, the change involved - * removal of arguments that are no longer needed by the + * removal of arguments that are no longer needed by the * callbacks, and thus no-longer need be passed through. * * JRM -- 10/13/07 @@ -6789,8 +6789,8 @@ done: * function by a serialize function. This can happen if * the serialize function associated with the entry being * flushed either accesses the next item in the LRU list, - * or (as Quincey assures me is impossible), it accesses - * an entry not currently in cache, causing the eviction + * or (as Quincey assures me is impossible), it accesses + * an entry not currently in cache, causing the eviction * of the next entry in the LRU. * * We handle this situation by detecting it, and restarting @@ -6805,7 +6805,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f, H5C2_t * cache_ptr, hbool_t write_permitted) { - /* const char * fcn_name = + /* const char * fcn_name = "H5C2__autoadjust__ageout__evict_aged_out_entries()"; */ herr_t ret_value = SUCCEED; /* Return value */ herr_t result; @@ -6893,7 +6893,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "*prev_ptr corrupt") - } else + } else #endif /* NDEBUG */ if ( ( prev_ptr->is_dirty != prev_is_dirty ) || @@ -7335,10 +7335,10 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr, case H5C2_flash_incr__add_space: if ( cache_ptr->index_size < cache_ptr->max_cache_size ) { - HDassert( (cache_ptr->max_cache_size - + HDassert( (cache_ptr->max_cache_size - cache_ptr->index_size) < space_needed ); - space_needed -= cache_ptr->max_cache_size - + space_needed -= cache_ptr->max_cache_size - cache_ptr->index_size; } space_needed = @@ -7557,29 +7557,29 @@ H5C2_flush_invalidate_cache(const H5F_t * f, /* The flush proceedure here is a bit strange. * - * In the outer while loop we make at least one pass through the + * In the outer while loop we make at least one pass through the * cache, and then repeat until either all the pinned entries * unpin themselves, or until the number of pinned entries stops * declining. In this later case, we scream and die. * * Since the fractal heap can dirty, resize, and/or rename entries * in is flush callback, it is possible that the cache will still - * contain dirty entries at this point. If so, we must make up to - * H5C2__MAX_PASSES_ON_FLUSH more passes through the skip list + * contain dirty entries at this point. If so, we must make up to + * H5C2__MAX_PASSES_ON_FLUSH more passes through the skip list * to allow it to empty. If is is not empty at this point, we again * scream and die. * - * Further, since clean entries can be dirtied, resized, and/or renamed + * Further, since clean entries can be dirtied, resized, and/or renamed * as the result of a flush call back (either the entries own, or that - * for some other cache entry), we can no longer promise to flush + * for some other cache entry), we can no longer promise to flush * the cache entries in increasing address order. * * Instead, we just do the best we can -- making a pass through - * the skip list, and then a pass through the "clean" entries, and - * then repeating as needed. Thus it is quite possible that an + * the skip list, and then a pass through the "clean" entries, and + * then repeating as needed. Thus it is quite possible that an * entry will be evicted from the cache only to be re-loaded later - * in the flush process (From what Quincey tells me, the pin - * mechanism makes this impossible, but even it it is true now, + * in the flush process (From what Quincey tells me, the pin + * mechanism makes this impossible, but even it it is true now, * we shouldn't count on it in the future.) * * The bottom line is that entries will probably be flushed in close @@ -7592,10 +7592,10 @@ H5C2_flush_invalidate_cache(const H5F_t * f, while ( ! done ) { /* first, try to flush-destroy any dirty entries. Do this by - * making a scan through the slist. Note that new dirty entries + * making a scan through the slist. Note that new dirty entries * may be created by the flush call backs. Thus it is possible * that the slist will not be empty after we finish the scan. - */ + */ if ( cache_ptr->slist_len == 0 ) { @@ -7619,7 +7619,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, "next_entry_ptr == NULL 1 ?!?!"); } #ifndef NDEBUG - HDassert( next_entry_ptr->magic == + HDassert( next_entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ); #endif /* NDEBUG */ HDassert( next_entry_ptr->is_dirty ); @@ -7664,18 +7664,18 @@ H5C2_flush_invalidate_cache(const H5F_t * f, * that the serialize callback will dirty and/or resize * other entries in the cache. In particular, while * Quincey has promised me that this will never happen, - * it is possible that the serialize callback for an + * it is possible that the serialize callback for an * entry may protect an entry that is not in the cache, - * perhaps causing the cache to flush and possibly + * perhaps causing the cache to flush and possibly * evict the entry associated with node_ptr to make * space for the new entry. * * Thus we do a bit of extra sanity checking on entry_ptr, - * and break out of this scan of the skip list if we - * detect major problems. We have a bit of leaway on the - * number of passes though the skip list, so this shouldn't - * be an issue in the flush in and of itself, as it should - * be all but impossible for this to happen more than once + * and break out of this scan of the skip list if we + * detect major problems. We have a bit of leaway on the + * number of passes though the skip list, so this shouldn't + * be an issue in the flush in and of itself, as it should + * be all but impossible for this to happen more than once * in any flush. * * Observe that that breaking out of the scan early @@ -7685,7 +7685,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, * If an entry has merely been marked clean and removed from * the s-list, we simply break out of the scan. * - * If the entry has been evicted, we flag an error and + * If the entry has been evicted, we flag an error and * exit. */ #ifndef NDEBUG @@ -7694,12 +7694,12 @@ H5C2_flush_invalidate_cache(const H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "entry_ptr->magic is invalid ?!?!"); - } else + } else #endif /* NDEBUG */ if ( ( ! entry_ptr->is_dirty ) || ( ! entry_ptr->in_slist ) ) { - /* the s-list has been modified out from under us. + /* the s-list has been modified out from under us. * break out of the loop. */ break; @@ -7719,7 +7719,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, "next_entry_ptr == NULL 2 ?!?!"); } #ifndef NDEBUG - HDassert( next_entry_ptr->magic == + HDassert( next_entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ); #endif /* NDEBUG */ HDassert( next_entry_ptr->is_dirty ); @@ -7736,8 +7736,8 @@ H5C2_flush_invalidate_cache(const H5F_t * f, * the slist. * * While this optimization used to be easy, with the possibility - * of new entries being added to the slist in the midst of the - * flush, we must keep the slist in cannonical form at all + * of new entries being added to the slist in the midst of the + * flush, we must keep the slist in cannonical form at all * times. */ @@ -7753,7 +7753,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, * cache_ptr->slist_size_increase. * * Note that we include pinned entries in this count, even - * though we will not actually flush them. + * though we will not actually flush them. */ actual_slist_len++; actual_slist_size += entry_ptr->size; @@ -7774,7 +7774,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, * as pinned entries can't be evicted. */ if ( TRUE ) { /* When we get to multithreaded cache, - * we will need either locking code, and/or + * we will need either locking code, and/or * a test to see if the entry is in flushable * condition here. */ @@ -7831,18 +7831,18 @@ H5C2_flush_invalidate_cache(const H5F_t * f, if ( node_ptr == NULL ) { - HDassert( (actual_slist_len + cache_ptr->slist_len) == + HDassert( (actual_slist_len + cache_ptr->slist_len) == (initial_slist_len + cache_ptr->slist_len_increase) ); - HDassert( (actual_slist_size + cache_ptr->slist_size) == + HDassert( (actual_slist_size + cache_ptr->slist_size) == (initial_slist_size + cache_ptr->slist_size_increase) ); } #endif /* H5C2_DO_SANITY_CHECKS */ /* Since we are doing a destroy, we must make a pass through * the hash table and try to flush - destroy all entries that - * remain. + * remain. * - * It used to be that all entries remaining in the cache at + * It used to be that all entries remaining in the cache at * this point had to be clean, but with the fractal heap mods * this may not be the case. If so, we will flush entries out * of increasing address order. @@ -7856,13 +7856,13 @@ H5C2_flush_invalidate_cache(const H5F_t * f, while ( next_entry_ptr != NULL ) { entry_ptr = next_entry_ptr; -#ifndef NDEBUG +#ifndef NDEBUG HDassert( entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ); #endif /* NDEBUG */ next_entry_ptr = entry_ptr->ht_next; #ifndef NDEBUG HDassert ( ( next_entry_ptr == NULL ) || - ( next_entry_ptr->magic == + ( next_entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) ); #endif /* NDEBUG */ if ( entry_ptr->is_protected ) { @@ -7878,7 +7878,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, } } else if ( ! ( entry_ptr->is_pinned ) ) { - status = + status = H5C2_flush_single_entry(f, dxpl_id, cache_ptr, @@ -7908,7 +7908,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, /* if the serialize function on the entry we last evicted * loaded an entry into cache (as Quincey has promised me - * it never will), and if the cache was full, it is + * it never will), and if the cache was full, it is * possible that *nexte_entry_ptr was flushed or evicted. * * Test to see if this happened here, and set next_entry_ptr @@ -7918,10 +7918,10 @@ H5C2_flush_invalidate_cache(const H5F_t * f, */ #ifndef NDEBUG if ( ( next_entry_ptr != NULL ) && - ( next_entry_ptr->magic != + ( next_entry_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) ) { - /* Something horrible has happened to + /* Something horrible has happened to * *next_entry_ptr -- scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ @@ -7946,7 +7946,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f, } else if ( ( cur_pel_len == 0 ) && ( old_pel_len == 0 ) ) { /* increment the pass count */ - passes++; + passes++; } if ( passes >= H5C2__MAX_PASSES_ON_FLUSH ) { @@ -8068,19 +8068,19 @@ done: * as there is no write to file in this case. * * JRM -- 8/21/06 - * Added code maintaining the flush_in_progress and - * destroy_in_progress fields in H5C2_cache_entry_t. - * - * Also added flush_flags parameter to the call to - * type_ptr->flush() so that the flush routine can report - * whether the entry has been resized or renamed. Added - * code using the flush_flags variable to detect the case - * in which the target entry is resized during flush, and + * Added code maintaining the flush_in_progress and + * destroy_in_progress fields in H5C2_cache_entry_t. + * + * Also added flush_flags parameter to the call to + * type_ptr->flush() so that the flush routine can report + * whether the entry has been resized or renamed. Added + * code using the flush_flags variable to detect the case + * in which the target entry is resized during flush, and * update the caches data structures accordingly. * * * JRM -- 3/29/07 - * Added sanity checks on the new is_read_only and + * Added sanity checks on the new is_read_only and * ro_ref_count fields. * * JRM -- 6/25/07 @@ -8095,12 +8095,12 @@ done: * is now in the cache, the function of these flags should * be documented explicitly here in H5C2. * - * If the H5C2__FLUSH_INVALIDATE_FLAG is set, the entry is to - * be written to disk if dirty, and then evicted from the + * If the H5C2__FLUSH_INVALIDATE_FLAG is set, the entry is to + * be written to disk if dirty, and then evicted from the * cache and discarded. As an optimization, the destroyed * is deleted from the slist only on request. * - * If the H5C2__FLUSH_CLEAR_ONLY_FLAG is set, the entry is + * If the H5C2__FLUSH_CLEAR_ONLY_FLAG is set, the entry is * to be marked clean if it is dirty. Under no circumstances * will it be written to disk. * @@ -8111,7 +8111,7 @@ done: * or not as requested. * * JRM -- 3/31/08 - * If journaling is enabled, modified function to remove + * If journaling is enabled, modified function to remove * the target entry from the transaction list on a clear. * Also added some sanity checks. * @@ -8163,7 +8163,7 @@ H5C2_flush_single_entry(const H5F_t * f, if ( entry_ptr->in_slist ) { - if ( ( ( entry_ptr->flush_marker ) && ( ! entry_ptr->is_dirty ) ) + if ( ( ( entry_ptr->flush_marker ) && ( ! entry_ptr->is_dirty ) ) || ( entry_ptr->addr != addr ) ) { @@ -8181,7 +8181,7 @@ H5C2_flush_single_entry(const H5F_t * f, } } } -#if 0 +#if 0 /* this should be useful for debugging from time to time. * lets leave it in for now. -- JRM 12/15/04 */ @@ -8244,7 +8244,7 @@ H5C2_flush_single_entry(const H5F_t * f, } /* Sanity check transfer mode */ - /* I'm surprised that this sanity check is working at + /* I'm surprised that this sanity check is working at * present -- will need to look into it at some point. * * JRM -- 7/7/07 @@ -8277,8 +8277,8 @@ H5C2_flush_single_entry(const H5F_t * f, * from the slist only if requested. * * Note that it is possible that the entry will be renamed during - * its call to flush. This will upset H5C2_rename_entry() if we - * don't tell it that it doesn't have to worry about updating the + * its call to flush. This will upset H5C2_rename_entry() if we + * don't tell it that it doesn't have to worry about updating the * index and SLIST. Use the destroy_in_progress field for this * purpose. */ @@ -8302,7 +8302,7 @@ H5C2_flush_single_entry(const H5F_t * f, #if 0 /* JRM */ /* This test code may come in handy -- lets keep it for a while. * - * Note that it will cause spurious errors in the serial case + * Note that it will cause spurious errors in the serial case * unless we are maintaining the clean and dirty LRU lists. */ { @@ -8319,12 +8319,12 @@ H5C2_flush_single_entry(const H5F_t * f, fcn_name); if ( cache_ptr->dLRU_list_len <= 0 ) - HDfprintf(stdout, + HDfprintf(stdout, "%s: cache_ptr->dLRU_list_len <= 0.\n", fcn_name); if ( cache_ptr->dLRU_list_size <= 0 ) - HDfprintf(stdout, + HDfprintf(stdout, "%s: cache_ptr->dLRU_list_size <= 0.\n", fcn_name); @@ -8341,14 +8341,14 @@ H5C2_flush_single_entry(const H5F_t * f, if ( ( entry_ptr->aux_prev == NULL ) && ( cache_ptr->dLRU_head_ptr != entry_ptr ) ) - HDfprintf(stdout, + HDfprintf(stdout, "%s: entry_ptr->aux_prev == NULL && dLRU_head_ptr != entry_ptr\n", fcn_name); if ( ( entry_ptr->aux_next == NULL ) && ( cache_ptr->dLRU_tail_ptr != entry_ptr ) ) - HDfprintf(stdout, - "%s: entry_ptr->aux_next == NULL && dLRU_tail_ptr != entry_ptr\n", + HDfprintf(stdout, + "%s: entry_ptr->aux_next == NULL && dLRU_tail_ptr != entry_ptr\n", fcn_name); if ( ( cache_ptr->dLRU_list_len == 1 ) && @@ -8361,7 +8361,7 @@ H5C2_flush_single_entry(const H5F_t * f, ) ) { - HDfprintf(stdout, + HDfprintf(stdout, "%s: single entry dlru sanity check fails\n", fcn_name); } @@ -8370,12 +8370,12 @@ H5C2_flush_single_entry(const H5F_t * f, else { if ( cache_ptr->cLRU_head_ptr == NULL ) - HDfprintf(stdout, + HDfprintf(stdout, "%s: cache_ptr->cLRU_head_ptr == NULL.\n", fcn_name); if ( cache_ptr->cLRU_tail_ptr == NULL ) - HDfprintf(stdout, + HDfprintf(stdout, "%s: cache_ptr->cLRU_tail_ptr == NULL.\n", fcn_name); @@ -8418,7 +8418,7 @@ H5C2_flush_single_entry(const H5F_t * f, ) ) { - HDfprintf(stdout, + HDfprintf(stdout, "%s: single entry clru sanity check fails\n", fcn_name); } @@ -8435,17 +8435,17 @@ H5C2_flush_single_entry(const H5F_t * f, * list and set its last_trans field to zero. * * Must do this now, as otherwise H5C2__UPDATE_RP_FOR_FLUSH may - * scream incorrectly about flushing an entry with a pending + * scream incorrectly about flushing an entry with a pending * journal write. */ if ( clear_only ) { H5C2__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, FAIL); } - /* We are either doing a flush or a clear. - * + /* We are either doing a flush or a clear. + * * A clear and a flush are the same from the point of view of - * the replacement policy and the slist. Hence no + * the replacement policy and the slist. Hence no * differentiation between them. * JRM -- 7/7/07 */ @@ -8460,7 +8460,7 @@ H5C2_flush_single_entry(const H5F_t * f, /* Clear the dirty flag only, if requested */ - if ( clear_only ) + if ( clear_only ) { if ( entry_ptr->is_dirty ) { @@ -8468,8 +8468,8 @@ H5C2_flush_single_entry(const H5F_t * f, /* only call the clear_dirty_bits callback if debugging * is enabled. */ - if ( entry_ptr->type->clear_dirty_bits && entry_ptr->type->clear_dirty_bits(addr, - entry_ptr->size, + if ( entry_ptr->type->clear_dirty_bits && entry_ptr->type->clear_dirty_bits(addr, + entry_ptr->size, (void *)entry_ptr) != SUCCEED ) { @@ -8477,20 +8477,20 @@ H5C2_flush_single_entry(const H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ "clear_dirty_bits() failed.") } -#endif /* NDEBUG */ +#endif /* NDEBUG */ } entry_ptr->is_dirty = FALSE; - } - else if ( entry_ptr->is_dirty ) + } + else if ( entry_ptr->is_dirty ) { - /* The entry is dirty, and we are doing either a flush, - * or a flush destroy. In either case, serialize the + /* The entry is dirty, and we are doing either a flush, + * or a flush destroy. In either case, serialize the * entry and write it to disk. * * If the serialize function changes the size or location * of the entry, and we are not doing a flush destroy, we - * will have to touch up the cache to account for the + * will have to touch up the cache to account for the * change(s). */ @@ -8519,7 +8519,7 @@ H5C2_flush_single_entry(const H5F_t * f, if ( entry_ptr->type->serialize(f, dxpl_id, - entry_ptr->addr, + entry_ptr->addr, entry_ptr->size, entry_ptr->image_ptr, (void *)entry_ptr, @@ -8543,31 +8543,31 @@ H5C2_flush_single_entry(const H5F_t * f, "rename/resize on destroy when journaling enabled."); } - /* We have already removed the entry from the + /* We have already removed the entry from the * cache's data structures, so no need to update * them for the re-size and/or rename. All we need * to do is update the cache entry so we will have * the correct values when we actually write the * image of the entry to disk. * - * Note that if the serialize function changes the + * Note that if the serialize function changes the * size of the disk image of the entry, it must * deallocate the old image, and allocate a new. */ - switch ( serialize_flags ) - { - case H5C2__SERIALIZE_RESIZED_FLAG: + switch ( serialize_flags ) + { + case H5C2__SERIALIZE_RESIZED_FLAG: H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE( \ cache_ptr, \ entry_ptr, \ new_len) entry_ptr->size = new_len; entry_ptr->image_ptr = new_image_ptr; - break; - - case (H5C2__SERIALIZE_RESIZED_FLAG | - H5C2__SERIALIZE_RENAMED_FLAG): + break; + + case (H5C2__SERIALIZE_RESIZED_FLAG | + H5C2__SERIALIZE_RENAMED_FLAG): H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE( \ cache_ptr, \ entry_ptr, \ @@ -8575,9 +8575,9 @@ H5C2_flush_single_entry(const H5F_t * f, entry_ptr->addr = new_addr; entry_ptr->size = new_len; entry_ptr->image_ptr = new_image_ptr; - break; - - default: + break; + + default: HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ "unexpected serialize flag(s)") break; @@ -8592,21 +8592,21 @@ H5C2_flush_single_entry(const H5F_t * f, } /* The entry is not being destroyed, and thus has not - * been removed from the cache's data structures. + * been removed from the cache's data structures. * - * Thus, in addition to updating the entry for the + * Thus, in addition to updating the entry for the * re-size and/or rename, we must also update the * cache data structures. */ - switch ( serialize_flags ) - { - case H5C2__SERIALIZE_RESIZED_FLAG: + switch ( serialize_flags ) + { + case H5C2__SERIALIZE_RESIZED_FLAG: H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE( \ cache_ptr, \ entry_ptr, \ new_len) - /* The replacement policy code thinks the + /* The replacement policy code thinks the * entry is already clean, so modify is_dirty * to meet this expectation. */ @@ -8619,34 +8619,34 @@ H5C2_flush_single_entry(const H5F_t * f, (new_len)); /* The entry can't be protected since we are - * in the process of flushing it. Thus we must - * update the replacement policy data - * structures for the size change. The macro - * deals with the pinned case. + * in the process of flushing it. Thus we must + * update the replacement policy data + * structures for the size change. The macro + * deals with the pinned case. */ H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \ entry_ptr, \ new_len); - /* The entry can't be in the slist, so no need - * to update the slist for the size change. + /* The entry can't be in the slist, so no need + * to update the slist for the size change. */ - /* finally, set is_dirty to TRUE again, and + /* finally, set is_dirty to TRUE again, and * update the size and image_ptr. */ entry_ptr->is_dirty = TRUE; entry_ptr->size = new_len; entry_ptr->image_ptr = new_image_ptr; - break; - - case (H5C2__SERIALIZE_RESIZED_FLAG | - H5C2__SERIALIZE_RENAMED_FLAG): + break; + + case (H5C2__SERIALIZE_RESIZED_FLAG | + H5C2__SERIALIZE_RENAMED_FLAG): H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE( \ cache_ptr, \ entry_ptr, \ new_len) - /* The replacement policy code thinks the + /* The replacement policy code thinks the * entry is already clean, so modify is_dirty * to meet this expectation. */ @@ -8664,30 +8664,30 @@ H5C2_flush_single_entry(const H5F_t * f, (entry_ptr->size),\ (new_len)); - /* The entry can't be protected since we are - * in the process of flushing it. Thus we must - * update the replacement policy data - * structures for the size change. The macro - * deals with the pinned case. + /* The entry can't be protected since we are + * in the process of flushing it. Thus we must + * update the replacement policy data + * structures for the size change. The macro + * deals with the pinned case. */ H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \ entry_ptr, \ new_len); - /* The entry can't be in the slist, so no need - * to update the slist for the size change. + /* The entry can't be in the slist, so no need + * to update the slist for the size change. */ - /* finally, set is_dirty to TRUE again, and + /* finally, set is_dirty to TRUE again, and * update the size and image_ptr. */ entry_ptr->is_dirty = TRUE; entry_ptr->size = new_len; entry_ptr->image_ptr = new_image_ptr; - break; - - default: + break; + + default: HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ "unexpected serialize flag(s)") break; @@ -8698,8 +8698,8 @@ H5C2_flush_single_entry(const H5F_t * f, } /* now write the image to disk */ - if ( H5F_block_write(f, type_ptr->mem_type, entry_ptr->addr, - entry_ptr->size, dxpl_id, + if ( H5F_block_write(f, type_ptr->mem_type, entry_ptr->addr, + entry_ptr->size, dxpl_id, entry_ptr->image_ptr) < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \ @@ -8714,25 +8714,25 @@ H5C2_flush_single_entry(const H5F_t * f, if ( serialize_flags != 0 ) { /* In the parallel case, resizes and renames in - * the serialize operation can cause problems. + * the serialize operation can cause problems. * If they occur, scream and die. * * At present, in the parallel case, the aux_ptr - * will only be set if there is more than one - * process. Thus we can use this to detect + * will only be set if there is more than one + * process. Thus we can use this to detect * the parallel case. * - * This works for now, but if we start using the - * aux_ptr for other purposes, we will have to + * This works for now, but if we start using the + * aux_ptr for other purposes, we will have to * change this test accordingly. * * NB: While this test detects entryies that attempt * to resize or rename themselves during a flush * in the parallel case, it will not detect an - * entry that dirties, resizes, and/or renames + * entry that dirties, resizes, and/or renames * other entries during its flush. * - * From what Quincey tells me, this test is + * From what Quincey tells me, this test is * sufficient for now, as any flush routine that * does the latter will also do the former. * @@ -8767,7 +8767,7 @@ H5C2_flush_single_entry(const H5F_t * f, } /* we are about to discard the in core representation -- - * set the magic field to bad magic so we can detect a + * set the magic field to bad magic so we can detect a * freed entry if we see one. * * Also reset the pointer to the cache the entry is within. -QAK @@ -8835,7 +8835,7 @@ done: * * JRM - 6/23/06 * Deleted assertion that verified that a newly loaded - * entry is clean. Due to a bug fix, this need not be + * entry is clean. Due to a bug fix, this need not be * the case, as our code will attempt to repair errors * on load. * @@ -8844,19 +8844,19 @@ done: * destroy in progress fields. * * JRM - 3/29/07 - * Added initialization for the new is_read_only and + * Added initialization for the new is_read_only and * ro_ref_count fields. * * JRM - 6/25/07 - * Reworked function to use the new client callback - * functions that are needed to implement metadata + * Reworked function to use the new client callback + * functions that are needed to implement metadata * journaling. Removed skip_file_checks parameter. * * JRM -- 10/12/07 * Added initialization for the new magic field. * * JRM -- 3/26/08 - * Added initialization for the journaling related + * Added initialization for the journaling related * fields. * *------------------------------------------------------------------------- @@ -8943,7 +8943,7 @@ H5C2_load_entry(H5F_t * f, } /* If the client's cache has an image_len callback, check it */ - if ( type->image_len ) + if ( type->image_len ) { size_t new_len; @@ -8965,8 +8965,8 @@ H5C2_load_entry(H5F_t * f, "image_ptr null after H5MM_realloc().") } - /* If the thing's image needs to be bigger, free the thing - * and retry with new length + /* If the thing's image needs to be bigger, free the thing + * and retry with new length */ if ( new_len > len) { @@ -8976,14 +8976,14 @@ H5C2_load_entry(H5F_t * f, "free_icr callback failed.") } - if ( H5F_block_read(f, type->mem_type, addr, new_len, + if ( H5F_block_read(f, type->mem_type, addr, new_len, dxpl_id, image_ptr) < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, \ "Can't read image") } - thing = type->deserialize(addr, new_len, image_ptr, + thing = type->deserialize(addr, new_len, image_ptr, udata_ptr, &dirty); if ( thing == NULL ) { @@ -9002,10 +9002,10 @@ H5C2_load_entry(H5F_t * f, entry_ptr = (H5C2_cache_entry_t *)thing; /* In general, an entry should be clean just after it is loaded. - * + * * However, when this code is used in the metadata cache, it is - * possible that object headers will be dirty at this point, as - * the deserialize function will alter object headers if necessary to + * possible that object headers will be dirty at this point, as + * the deserialize function will alter object headers if necessary to * fix an old bug. * * In the following assert: @@ -9015,7 +9015,7 @@ H5C2_load_entry(H5F_t * f, * note that type ids 5 & 6 are associated with object headers in the metadata * cache. * - * When we get to using H5C2 for other purposes, we may wish to + * When we get to using H5C2 for other purposes, we may wish to * tighten up the assert so that the loophole only applies to the * metadata cache. */ @@ -9122,17 +9122,17 @@ done: * min clean size before the cache has filled. * * JRM -- 3/29/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields. * * JRM -- 8/24/07 * Reworked parameter list and code for the removal of the - * secondary dxpl id, and the decision to store the file + * secondary dxpl id, and the decision to store the file * pointer f in *cache_ptr. * * JRM -- 10/12/07 * Added code to detect the case in which the LRU list has - * been modified by a serialize callback, and cause the + * been modified by a serialize callback, and cause the * function to re-start its scan at the tail of the LRU. * *------------------------------------------------------------------------- @@ -9207,7 +9207,7 @@ H5C2_make_space_in_cache(H5F_t * f, FALSE); } else { - result = + result = H5C2_flush_single_entry(f, dxpl_id, cache_ptr, @@ -9235,13 +9235,13 @@ H5C2_make_space_in_cache(H5F_t * f, #ifndef NDEBUG if ( prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) { - /* something horrible has happened to *prev_ptr -- + /* something horrible has happened to *prev_ptr -- * scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "*prev_ptr corrupt 1") - } else + } else #endif /* NDEBUG */ if ( entry_is_epoch_maker ) { @@ -9251,7 +9251,7 @@ H5C2_make_space_in_cache(H5F_t * f, */ entry_ptr = prev_ptr; - } else if ( ( prev_ptr->is_dirty != prev_is_dirty ) + } else if ( ( prev_ptr->is_dirty != prev_is_dirty ) || ( prev_ptr->next != next_ptr ) || @@ -9259,7 +9259,7 @@ H5C2_make_space_in_cache(H5F_t * f, || ( prev_ptr->is_pinned ) ) { - /* something has happened to the LRU -- start over + /* something has happened to the LRU -- start over * from the tail. */ entry_ptr = cache_ptr->LRU_tail_ptr; @@ -9333,16 +9333,16 @@ H5C2_make_space_in_cache(H5F_t * f, #ifndef NDEBUG if (prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC) { - /* something horrible has happened to *prev_ptr -- + /* something horrible has happened to *prev_ptr -- * scream and die. */ HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "*prev_ptr corrupt 2") - } else + } else #endif /* #ifndef NDEBUG */ - if ( ( ! ( prev_ptr->is_dirty ) ) + if ( ( ! ( prev_ptr->is_dirty ) ) || ( prev_ptr->aux_next != next_ptr ) || @@ -9350,29 +9350,29 @@ H5C2_make_space_in_cache(H5F_t * f, || ( prev_ptr->is_pinned ) ) { - /* something has happened to the dirty LRU -- start over + /* something has happened to the dirty LRU -- start over * from the tail. */ #if 0 /* This debuging code may be useful in the future -- keep it for now. */ if ( ! ( prev_ptr->is_dirty ) ) { - HDfprintf(stdout, "%s: ! prev_ptr->is_dirty\n", + HDfprintf(stdout, "%s: ! prev_ptr->is_dirty\n", fcn_name); } if ( prev_ptr->aux_next != next_ptr ) { - HDfprintf(stdout, "%s: prev_ptr->next != next_ptr\n", + HDfprintf(stdout, "%s: prev_ptr->next != next_ptr\n", fcn_name); } if ( prev_ptr->is_protected ) { - HDfprintf(stdout, "%s: prev_ptr->is_protected\n", + HDfprintf(stdout, "%s: prev_ptr->is_protected\n", fcn_name); } if ( prev_ptr->is_pinned ) { - HDfprintf(stdout, "%s:prev_ptr->is_pinned\n", + HDfprintf(stdout, "%s:prev_ptr->is_pinned\n", fcn_name); } - HDfprintf(stdout, "%s: re-starting scan of dirty list\n", + HDfprintf(stdout, "%s: re-starting scan of dirty list\n", fcn_name); #endif /* JRM */ entry_ptr = cache_ptr->dLRU_tail_ptr; @@ -9431,9 +9431,9 @@ H5C2_make_space_in_cache(H5F_t * f, "unable to flush entry") } - /* we are scanning the clean LRU, so the serialize function + /* we are scanning the clean LRU, so the serialize function * will not be called on any entry -- thus there is no - * concern about the list being modified out from under + * concern about the list being modified out from under * this function. */ diff --git a/src/H5C2journal.c b/src/H5C2journal.c index 2aeedd4..88f815e 100644 --- a/src/H5C2journal.c +++ b/src/H5C2journal.c @@ -22,12 +22,12 @@ * Purpose: This file is a general catchall for functions supporting * metadata journaling. Note that journaling must be tighly * integrated with the metadata cache, and thus this file only - * contains only that code that can be easily separated from + * contains only that code that can be easily separated from * the rest of the cache code. * * Observe also that to minimize overhead, it is quite possible * that many of the functions in this file will be converted - * into macros at some point in the future. + * into macros at some point in the future. * * Modifications: * @@ -108,7 +108,7 @@ static herr_t H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, static herr_t H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, size_t length, - hbool_t is_end_trans, + hbool_t is_end_trans, uint64_t trans_num); static herr_t H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, @@ -170,14 +170,14 @@ static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr); * structure. * * JRM -- 8/18/08 - * Added code to flush the cache before journaling + * Added code to flush the cache before journaling * starts, and to call the metadata journaling status * change callbacks after journaling has been started. * * JRM -- 2/10/09 - * Added journal_magic variable and supporting code. + * Added journal_magic variable and supporting code. * - * The idea is to assign a random magic number to both the + * The idea is to assign a random magic number to both the * journal file, and to the journal configuration information * information in the super block so that it will be hard to * apply the wrong journal file to a corrupted hdf5 file. @@ -233,7 +233,7 @@ H5C2_begin_journaling(H5F_t * f, if ( result < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ - "H5C2_flush_cache() failed.") + "H5C2_flush_cache() failed.") } journal_magic = (int32_t)HDrand(); @@ -294,8 +294,8 @@ done: * Function: H5C2_begin_transaction * * Purpose: Handle book keeping for the beginning of a transaction, and - * return the transaction ID assigned to the transaction in - * *trans_num_ptr. + * return the transaction ID assigned to the transaction in + * *trans_num_ptr. * * Return: Success: SUCCEED * Failure: FAIL @@ -361,7 +361,7 @@ done: * journal file. * * 2) Mark the superblock to indicate that we are no longer - * journaling. Note that this will flush the HDF5 file + * journaling. Note that this will flush the HDF5 file * again in passing. * * 3) Tell the journal file write code to shutdown. This will @@ -409,7 +409,7 @@ H5C2_end_journaling(H5F_t * f, if ( result < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ - "H5C2_flush_cache() failed.") + "H5C2_flush_cache() failed.") } HDassert( cache_ptr->mdj_enabled ); @@ -422,7 +422,7 @@ H5C2_end_journaling(H5F_t * f, cache_ptr->mdj_enabled = FALSE; /* Remove the journal configuration information from the superblock - * extension. In passing, also discard the cache's copies of the + * extension. In passing, also discard the cache's copies of the * metadata journaling magic, and the journal file name. */ result = H5C2_unmark_journaling_in_progress(f, dxpl_id, cache_ptr); @@ -569,14 +569,14 @@ done: * Purpose: Return the current metadata journaling status in an * instance of H5C2_mdj_config_t. * - * If journaling is enabled, config_ptr->enable_journaling + * If journaling is enabled, config_ptr->enable_journaling * is set to TRUE, and the remaining fields in *config_ptr * will be set to reflect current journaling status. * * If journaling is disabled, config_ptr->enable_journaling * is set to FALSE, and the remaining fields of *config_ptr * are undefined. - * + * * Return: Success: SUCCEED * Failure: FAIL * @@ -612,7 +612,7 @@ H5C2_get_journal_config(H5C2_t * cache_ptr, config_ptr->enable_journaling = TRUE; - HDstrncpy(&(config_ptr->journal_file_path[0]), + HDstrncpy(&(config_ptr->journal_file_path[0]), cache_ptr->jnl_file_name, H5C2__MAX_JOURNAL_FILE_NAME_LEN); @@ -625,7 +625,7 @@ H5C2_get_journal_config(H5C2_t * cache_ptr, config_ptr->jbrb_use_aio = (cache_ptr->mdj_jbrb).use_aio; config_ptr->jbrb_human_readable = (cache_ptr->mdj_jbrb).human_readable; - + } else { config_ptr->enable_journaling = FALSE; @@ -657,9 +657,9 @@ done: * * b) Truncate the journal file * - * c) Reset cache_ptr->trans_num and + * c) Reset cache_ptr->trans_num and * cache_ptr->last_trans_on_disk to zero. - * + * * Return: Success: SUCCEED * Failure: FAIL * @@ -724,7 +724,7 @@ H5C2_journal_post_flush(H5F_t * f, HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ "H5C2_jb__trunc() failed.") } - + cache_ptr->trans_num = (uint64_t)0; cache_ptr->last_trans_on_disk = (uint64_t)0; } @@ -751,13 +751,13 @@ done: * 3) Get the ID of the last transaction on disk. * * 4) If the value obtained in 3) above has changed, - * remove all entries whose last transaction has + * remove all entries whose last transaction has * made it to disk from the journal write in progress * list. * * 5) Verify that the journal write in progress list is * empty. - * + * * Return: Success: SUCCEED * Failure: FAIL * @@ -812,7 +812,7 @@ H5C2_journal_pre_flush(H5C2_t * cache_ptr) HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ "H5C2_update_for_new_last_trans_on_disk() failed.") } - } + } if ( cache_ptr->jwipl_len != 0 ) { @@ -857,11 +857,11 @@ H5C2_journal_transaction(H5F_t * f, size_t new_len; void * new_image_ptr; void * thing; - herr_t result; + herr_t result; herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5C2_journal_transaction, FAIL) - + HDassert( f != NULL ); HDassert( cache_ptr != NULL ); HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC ); @@ -879,7 +879,7 @@ H5C2_journal_transaction(H5F_t * f, "H5C2_jb__comment() failed.") } - result = H5C2_jb__start_transaction(&(cache_ptr->mdj_jbrb), + result = H5C2_jb__start_transaction(&(cache_ptr->mdj_jbrb), cache_ptr->trans_num); if ( result != SUCCEED ) { @@ -897,7 +897,7 @@ H5C2_journal_transaction(H5F_t * f, resized = FALSE; renamed = FALSE; - if ( entry_ptr->is_protected ) + if ( entry_ptr->is_protected ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -916,7 +916,7 @@ H5C2_journal_transaction(H5F_t * f, } } - /* This should always be true, unless the entry has already been + /* This should always be true, unless the entry has already been * serialized in this function, and that serialization caused the * entry to be resized (and possibly renamed as well). */ @@ -941,11 +941,11 @@ H5C2_journal_transaction(H5F_t * f, if ( serialize_flags != 0 ) { - /* if the serialize_flags are not zero, the entry has been + /* if the serialize_flags are not zero, the entry has been * modified as a result of the serialize. Pass these changes - * on to the cache, and don't bother to write a journal entry - * at this time -- the protect/unprotect/rename will move the - * entry to the head of the transaction list, where we will + * on to the cache, and don't bother to write a journal entry + * at this time -- the protect/unprotect/rename will move the + * entry to the head of the transaction list, where we will * handle it later. */ @@ -958,7 +958,7 @@ H5C2_journal_transaction(H5F_t * f, "entry renamed but not resized?!?!") } - if ( resized ) + if ( resized ) { /* in the following protect/unprotect, the dxpl_id * is irrelement, as we know that the entry is in cache, @@ -966,7 +966,7 @@ H5C2_journal_transaction(H5F_t * f, */ thing = H5C2_protect(f, dxpl_id, entry_ptr->type, entry_ptr->addr, - entry_ptr->size, NULL, + entry_ptr->size, NULL, H5C2__NO_FLAGS_SET); if ( thing == NULL ) { @@ -977,7 +977,7 @@ H5C2_journal_transaction(H5F_t * f, result = H5C2_unprotect(f, dxpl_id, entry_ptr->type, entry_ptr->addr, - thing, H5C2__SIZE_CHANGED_FLAG, + thing, H5C2__SIZE_CHANGED_FLAG, new_len); if ( result < 0 ) { @@ -1009,7 +1009,7 @@ H5C2_journal_transaction(H5F_t * f, * the journal entry, & remove from the transaction list. */ if ( ( ! resized ) && ( ! renamed ) ) { - + result = H5C2_jb__journal_entry(&(cache_ptr->mdj_jbrb), cache_ptr->trans_num, entry_ptr->addr, @@ -1051,7 +1051,7 @@ done: * Purpose: Update the journal write in progress list for a change in * the last transaction on disk. * - * Specifically, update the last_trans_on_disk field of + * Specifically, update the last_trans_on_disk field of * *cache_ptr, and then scan the journal write in progress * list for entries whose last_trans field is now less than * or equal to cache_ptr->last_trans_on_disk. Remove all @@ -1060,7 +1060,7 @@ done: * the eviction policy data structures. * * Similarly, scan the pinned entry list for entries whose - * last_trans field is now less than or equal to + * last_trans field is now less than or equal to * cache_ptr->last_trans_on_disk. In this case, just set * the last trans field to 0. Note that here we assume that * the pinned entry list will always be small -- if this @@ -1149,14 +1149,14 @@ done: * * Purpose: If the superblock extension of a newly opened HDF5 file * indicates that journaling is in progress, the process - * that created the file failed to close it properly, and + * that created the file failed to close it properly, and * thus the file is almost certainly corrupted. * * The purpose of this function is to detect this condition, - * and either throw an error telling the user to run the - * recovery tool, or if so directed (presumably by the - * recovery tool) simply delete the metadata journaling - * configuration block and any reference to journaling in the + * and either throw an error telling the user to run the + * recovery tool, or if so directed (presumably by the + * recovery tool) simply delete the metadata journaling + * configuration block and any reference to journaling in the * superblock extension. * * JRM -- 3/26/08 @@ -1180,7 +1180,7 @@ H5C2_check_for_journaling(H5F_t * f, "This file was last written with metadata journaling enabled and was \n"; const char * l1 = "not closed cleanly. To allow HDF5 to read this file, please run the \n"; - const char * l2 = + const char * l2 = "journal recovery tool on this file. The journal was written \n"; const char * l3 = "to \""; const char * l4 = "\".\n"; @@ -1215,8 +1215,8 @@ H5C2_check_for_journaling(H5F_t * f, * we were. */ - result = H5C2_unmark_journaling_in_progress(f, - dxpl_id, + result = H5C2_unmark_journaling_in_progress(f, + dxpl_id, cache_ptr); if ( result != SUCCEED ) { @@ -1226,14 +1226,14 @@ H5C2_check_for_journaling(H5F_t * f, } } else { - /* we have to play some games here to set up an error message - * that contains the journal file path. In essence, what - * follows is a somewhat modified version of the HGOTO_ERROR() + /* we have to play some games here to set up an error message + * that contains the journal file path. In essence, what + * follows is a somewhat modified version of the HGOTO_ERROR() * macro. */ - (void)H5Epush2(H5E_DEFAULT, __FILE__, FUNC, __LINE__, - H5E_ERR_CLS_g, H5E_CACHE, H5E_CANTJOURNAL, - "%s%s%s%s%s%s", l0, l1, l2, l3, + (void)H5Epush2(H5E_DEFAULT, __FILE__, FUNC, __LINE__, + H5E_ERR_CLS_g, H5E_CACHE, H5E_CANTJOURNAL, + "%s%s%s%s%s%s", l0, l1, l2, l3, cache_ptr->jnl_file_name, l4); (void)H5E_dump_api_stack((int)H5_IS_API(FUNC)); HGOTO_DONE(FAIL) @@ -1253,7 +1253,7 @@ done: * Function: H5C2_get_journaling_in_progress() * * Purpose: Query the HDF5 file to see if it is marked as having - * journaling in progress. Update the journaling + * journaling in progress. Update the journaling * configuration fields in the cache structure accordingly. * * At least initially, the purpose of this function is @@ -1279,8 +1279,8 @@ done: * March 11, 2008 * * Changes: JRM -- 2/20/09 - * Reworked to reflect the move of the journal file name - * and magic from the journaling configuration block to + * Reworked to reflect the move of the journal file name + * and magic from the journaling configuration block to * the metadata journaling superblock extension message. * Note that the journaling configuration block no longer * exists. @@ -1310,7 +1310,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f, "journaling enabled but jnl file name empty?!?.") } - if ( f->shared->mdc_jnl_file_name_len > + if ( f->shared->mdc_jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -1325,7 +1325,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f, if ( ( (cache_ptr->jnl_file_name)[cache_ptr->jnl_file_name_len] != '\0' ) || - ( HDstrlen(cache_ptr->jnl_file_name) != + ( HDstrlen(cache_ptr->jnl_file_name) != (size_t)(cache_ptr->jnl_file_name_len) ) ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -1343,14 +1343,14 @@ done: /*------------------------------------------------------------------------- * Function: H5C2_mark_journaling_in_progress() * - * Purpose: Modify the HDF5 file to indicate that journaling is - * in progress, and flush the file to disk. + * Purpose: Modify the HDF5 file to indicate that journaling is + * in progress, and flush the file to disk. * - * The objective here is to allow us to detect the fact - * the file was being journaled if we crash before we + * The objective here is to allow us to detect the fact + * the file was being journaled if we crash before we * close the file properly. * - * Note that the function assumes that the file is not + * Note that the function assumes that the file is not * currently marked as having journaling in progress. * * Return: Success: SUCCEED @@ -1422,8 +1422,8 @@ H5C2_mark_journaling_in_progress(H5F_t * f, (size_t)(cache_ptr->jnl_file_name_len + 1)); /* now, load the journaling information into shared, and then call - * H5F_super_write_mdj_msg() to write the metadata journaling - * superblock extension message to file. + * H5F_super_write_mdj_msg() to write the metadata journaling + * superblock extension message to file. */ f->shared->mdc_jnl_enabled = TRUE; f->shared->mdc_jnl_magic = journal_magic; @@ -1455,12 +1455,12 @@ done: /*------------------------------------------------------------------------- * Function: H5C2_unmark_journaling_in_progress() * - * Purpose: Modify the HDF5 file to indicate that journaling is - * not in progress, and flush the file to disk. + * Purpose: Modify the HDF5 file to indicate that journaling is + * not in progress, and flush the file to disk. * * The objective here is to remove the messages indicating - * that the file is being journaled. We will typically do - * this either on file close, or if directed to cease + * that the file is being journaled. We will typically do + * this either on file close, or if directed to cease * journaling. Once these messages are removed, we will * be able to open the file without triggering a "journaling * in progress" failure. @@ -1475,10 +1475,10 @@ done: * March 11, 2008 * * Changes: JRM -- 2/20/09 - * Reworked function to reflect the move of the journal + * Reworked function to reflect the move of the journal * file name and magic from the metadata journaling config - * block and into a superblock extension message. Note that - * the metadata journaling configuration block no longer + * block and into a superblock extension message. Note that + * the metadata journaling configuration block no longer * exists. * *------------------------------------------------------------------------- @@ -1520,7 +1520,7 @@ H5C2_unmark_journaling_in_progress(H5F_t * f, cache_ptr->jnl_file_name_len = 0; (cache_ptr->jnl_file_name)[0] = '\0'; - /* now, mark f->shared to indicate that journaling is not in + /* now, mark f->shared to indicate that journaling is not in * progress, and then call H5F_super_write_mdj_msg() to write * the changes to disk. */ @@ -1568,7 +1568,7 @@ done: */ static herr_t -H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, +H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, hid_t dxpl_id, H5C2_mdj_config_t * config_ptr) { @@ -1587,27 +1587,27 @@ H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, HDassert( ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) || ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) ); - if ( ( cache_ptr->num_mdjsc_cbs < 0 ) + if ( ( cache_ptr->num_mdjsc_cbs < 0 ) || - ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) + ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) || - ( cache_ptr->mdjsc_cb_tbl_fl_head < -1 ) + ( cache_ptr->mdjsc_cb_tbl_fl_head < -1 ) || - ( cache_ptr->mdjsc_cb_tbl_fl_head > cache_ptr->mdjsc_cb_tbl_len ) + ( cache_ptr->mdjsc_cb_tbl_fl_head > cache_ptr->mdjsc_cb_tbl_len ) || - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < -1 ) + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < -1 ) || - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= - cache_ptr->mdjsc_cb_tbl_len ) + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= + cache_ptr->mdjsc_cb_tbl_len ) || - ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) + ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) || ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) && - ( ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) + ( ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) || ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != - cache_ptr->mdjsc_cb_tbl_len - 1 ) + cache_ptr->mdjsc_cb_tbl_len - 1 ) ) ) || @@ -1652,7 +1652,7 @@ done: * Function: H5C2_deregister_mdjsc_callback() * * Purpose: Deregister a metadata journaling status change callback, - * shrinking the metadata journaling status callback table + * shrinking the metadata journaling status callback table * as necessary. * * Return: Success: SUCCEED @@ -1682,10 +1682,10 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr, } if ( ( cache_ptr->mdjsc_cb_tbl == NULL ) || - ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) + ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) && ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) ) || - ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) + ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) && ( cache_ptr->num_mdjsc_cbs != cache_ptr->mdjsc_cb_tbl_len ) ) || ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) || @@ -1694,7 +1694,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr, ( cache_ptr->num_mdjsc_cbs < 0 ) || ( ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < 0 ) && ( cache_ptr->num_mdjsc_cbs > 0 ) ) ) { - + HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "mdjsc_cb_tbl corrupt(1)?!?!"); } @@ -1710,19 +1710,19 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad idx?!?"); } else if ( ((cache_ptr->mdjsc_cb_tbl)[idx]).fcn_ptr == NULL ) { - + HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "callback already deregistered"); - + } else if ( ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next != -1 ) { - + HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "free list corrupted."); } ((cache_ptr->mdjsc_cb_tbl)[idx]).fcn_ptr = NULL; ((cache_ptr->mdjsc_cb_tbl)[idx]).data_ptr = NULL; - ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next = + ((cache_ptr->mdjsc_cb_tbl)[idx]).fl_next = cache_ptr->mdjsc_cb_tbl_fl_head; cache_ptr->mdjsc_cb_tbl_fl_head = idx; (cache_ptr->num_mdjsc_cbs)--; @@ -1752,19 +1752,19 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr, if ( ( cache_ptr->num_mdjsc_cbs >= cache_ptr->mdjsc_cb_tbl_len ) || - ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) + ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) && - ( cache_ptr->num_mdjsc_cbs > 0 ) + ( cache_ptr->num_mdjsc_cbs > 0 ) && - ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) + ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) || ( cache_ptr->mdjsc_cb_tbl_fl_head >= cache_ptr->mdjsc_cb_tbl_len ) - ) - ) + ) + ) || - ( ( cache_ptr->num_mdjsc_cbs == 0 ) + ( ( cache_ptr->num_mdjsc_cbs == 0 ) && - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != -1 ) + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != -1 ) ) ) { @@ -1776,7 +1776,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr, if ( ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) && ( cache_ptr->mdjsc_cb_tbl_len > H5C2__MIN_MDJSC_CB_TBL_LEN ) && - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < (cache_ptr->mdjsc_cb_tbl_len / 2) ) ) { herr_t result; @@ -1833,7 +1833,7 @@ H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr) if ( ( cache_ptr->num_mdjsc_cbs != cache_ptr->mdjsc_cb_tbl_len ) || ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) || - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use != cache_ptr->mdjsc_cb_tbl_len - 1 ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ @@ -1889,7 +1889,7 @@ done: * Function: H5C2_register_mdjsc_callback() * * Purpose: Register a metadata journaling status change callback, - * growing the metadata journaling status callback table + * growing the metadata journaling status callback table * as necessary. * * Return: Success: SUCCEED @@ -1972,18 +1972,18 @@ H5C2_register_mdjsc_callback(H5C2_t * cache_ptr, (cache_ptr->num_mdjsc_cbs)++; if ( ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len ) && - ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) - ) + ( cache_ptr->mdjsc_cb_tbl_fl_head != -1 ) + ) || - ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) + ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) || - ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) + ( ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) && - ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) + ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) || ( cache_ptr->mdjsc_cb_tbl_fl_head >= cache_ptr->mdjsc_cb_tbl_len ) - ) - ) + ) + ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "mdjsc_cb_tbl corrupt(2)?!?!"); @@ -2060,7 +2060,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr) if ( ( cache_ptr->num_mdjsc_cbs >= cache_ptr->mdjsc_cb_tbl_len ) || ( (cache_ptr->mdjsc_cb_tbl_len / 2) < H5C2__MIN_MDJSC_CB_TBL_LEN ) || ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) || - ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= + ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= cache_ptr->mdjsc_cb_tbl_len / 2 ) || ( fraction_in_use >= H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) ) { @@ -2074,10 +2074,10 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr) new_mdjsc_cb_tbl_len = old_mdjsc_cb_tbl_len / 2; while ( ( (new_mdjsc_cb_tbl_len / 2) >= H5C2__MIN_MDJSC_CB_TBL_LEN ) && - ( (((double)(cache_ptr->num_mdjsc_cbs)) / - ((double)new_mdjsc_cb_tbl_len)) <= + ( (((double)(cache_ptr->num_mdjsc_cbs)) / + ((double)new_mdjsc_cb_tbl_len)) <= H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) && - ( (new_mdjsc_cb_tbl_len / 2) > + ( (new_mdjsc_cb_tbl_len / 2) > cache_ptr->mdjsc_cb_tbl_max_idx_in_use ) ) { new_mdjsc_cb_tbl_len /= 2; @@ -2107,7 +2107,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr) new_mdjsc_cb_tbl[i].fcn_ptr = NULL; new_mdjsc_cb_tbl[i].data_ptr = NULL; new_mdjsc_cb_tbl[i].fl_next = -1; - + if ( new_fl_head == -1 ) { new_fl_head = i; @@ -2155,9 +2155,9 @@ done: /**************************************************************************/ /* The following macros are wrappers for the low level binary journal file - * functions. They exist, as it is likely that these function will be - * converted into macros once we have asynchronous journal file writes - * running, and by setting up these wrappers now, we will make this + * functions. They exist, as it is likely that these function will be + * converted into macros once we have asynchronous journal file writes + * running, and by setting up these wrappers now, we will make this * conversion easier. */ @@ -2236,7 +2236,7 @@ if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans), \ * * Programmer: John Mainzer * - * Purpose: In the binary journal file format, a comment is + * Purpose: In the binary journal file format, a comment is * a no-op. Thus in this function, we simply verify * that we are in fact writing a binary journal file, * and then return. @@ -2245,14 +2245,14 @@ if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans), \ * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__comment(H5C2_jbrb_t * struct_ptr, const char * comment_ptr) { herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb_bjf__comment, FAIL) - + /* Check Arguments */ HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); @@ -2282,13 +2282,13 @@ done: * Programmer: John Mainzer * * Purpose: Verify that the supplied transaction is in progress, - * and that at least one journal entry has been written - * under it. + * and that at least one journal entry has been written + * under it. * - * Then write an end transaction message to the ring + * Then write an end transaction message to the ring * buffer. * - * Make note that the supplied transaction is closed, + * Make note that the supplied transaction is closed, * and that no transaction is in progress. * * Returns: SUCCEED on success. @@ -2309,7 +2309,7 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr, HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); HDassert( struct_ptr->human_readable == FALSE ); - + /* Verify that the supplied transaction is in progress */ if ( ( struct_ptr->trans_in_prog != TRUE ) || ( struct_ptr->cur_trans != trans_num ) ) { @@ -2317,9 +2317,9 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "Transaction not in progress or bad transaction number.") } /* end if */ - - /* Verify that at least one journal entry has been written under - * the current transaction + + /* Verify that at least one journal entry has been written under + * the current transaction */ if ( struct_ptr->jentry_written != TRUE ) { @@ -2341,8 +2341,8 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr, trans_num, \ /* fail_return */ FAIL) - /* reset boolean flag indicating that at least one journal entry has - * been written under transaction + /* reset boolean flag indicating that at least one journal entry has + * been written under transaction */ struct_ptr->jentry_written = FALSE; @@ -2350,7 +2350,7 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr, struct_ptr->trans_in_prog = FALSE; done: - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb_bjf__end_transaction */ @@ -2362,15 +2362,15 @@ done: * * Programmer: John Mainzer * - * Purpose: Write an end of address space message with the + * Purpose: Write an end of address space message with the * supplied EOA in binary format to the journal file. * - * Note that EOA messages are not generated by the - * metadata cache, and thus are not associated with + * Note that EOA messages are not generated by the + * metadata cache, and thus are not associated with * transactions. Since H5C2_jb__write_to_buffer() - * expects a transaction number, we use + * expects a transaction number, we use * struct_ptr->cur_trans and pass is_end_trans - * as FALSE. However, this is just a cluge to + * as FALSE. However, this is just a cluge to * keep pre-existing code happy. * * Returns: SUCCEED on success. @@ -2379,21 +2379,21 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr, haddr_t eoa) { herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb_bjf__eoa, FAIL) - + /* Check Arguments */ HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); HDassert( struct_ptr->human_readable == FALSE ); HDassert( struct_ptr->hdf5_file_name != NULL ); - /* Verify that header message is present in journal file or ring buffer. - * If not, write it. + /* Verify that header message is present in journal file or ring buffer. + * If not, write it. */ if ( struct_ptr->header_present == FALSE ) { @@ -2404,10 +2404,10 @@ H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr, } } /* end if */ - /* Note that EOA messages are not generated by the metadata cache, and - * thus are not associated with transactions. Since - * H5C2_jb__write_to_buffer() expects a transaction number, we use - * struct_ptr->cur_trans and pass is_end_trans as FALSE. However, + /* Note that EOA messages are not generated by the metadata cache, and + * thus are not associated with transactions. Since + * H5C2_jb__write_to_buffer() expects a transaction number, we use + * struct_ptr->cur_trans and pass is_end_trans as FALSE. However, * this is just a cluge to keep pre-existing code happy. */ @@ -2446,7 +2446,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr, uint64_t trans_num, haddr_t base_addr, @@ -2507,8 +2507,8 @@ H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr, trans_num, \ /* fail_return */ FAIL) - /* Indicate that at least one journal entry has been written under - * this transaction + /* Indicate that at least one journal entry has been written under + * this transaction */ struct_ptr->jentry_written = TRUE; @@ -2527,9 +2527,9 @@ done: * Programmer: John Mainzer * * Purpose: Verify that there is no transaction in progress, and - * that the supplied transaction number greater than - * the last. Then write a binary start transaction - * message to the ring buffer. Make note of the fact + * that the supplied transaction number greater than + * the last. Then write a binary start transaction + * message to the ring buffer. Make note of the fact * that the supplied transaction is in progress. * * Returns: SUCCEED on success. @@ -2538,7 +2538,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr, uint64_t trans_num) @@ -2551,7 +2551,7 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr, HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); HDassert(struct_ptr->human_readable == FALSE ); - + /* Verify that there is no transaction in progress */ if ( struct_ptr->trans_in_prog != FALSE ) { @@ -2566,8 +2566,8 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr, "New transaction out of sequence.") } /* end if */ - /* Verify that header message is present in journal file or ring buffer. - * If not, write it. + /* Verify that header message is present in journal file or ring buffer. + * If not, write it. */ if ( struct_ptr->header_present == FALSE ) { @@ -2593,13 +2593,13 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr, /* is_end_trans */ FALSE, \ trans_num, \ /* fail_return */ FAIL) - + /* Make note of the fact that supplied transaction is in progress */ struct_ptr->trans_in_prog = TRUE; struct_ptr->cur_trans = trans_num; done: - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb_bjf__start_transaction */ @@ -2612,16 +2612,16 @@ done: * Programmer: John Mainzer * 4/24/09 * - * Purpose: Copy the supplied buffer to the ring buffer as + * Purpose: Copy the supplied buffer to the ring buffer as * efficiently as possible. * - * If there is space available in the current buffer in - * the ring buffer is big enough, just memcpy the + * If there is space available in the current buffer in + * the ring buffer is big enough, just memcpy the * supplied buffer directly into the ring buffer buffer - * and update its fields accordingly. + * and update its fields accordingly. * - * If the supplied buffer will cross ring buffer buffer - * boundaries, for now just call + * If the supplied buffer will cross ring buffer buffer + * boundaries, for now just call * H5C2_jb__write_to_buffer(). * * In either case, if struct_ptr->chksum_cur_msg is TRUE, @@ -2638,7 +2638,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr, size_t buf_size, const char * buf_ptr, @@ -2653,7 +2653,7 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr, HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); HDassert( buf_size > 0 ); HDassert( buf_ptr != NULL ); - HDassert( trans_num > 0 ); + HDassert( trans_num > 0 ); /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE. * Throw an error if this invarient doesn't hold. @@ -2668,8 +2668,8 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf_ptr), - buf_size, + struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf_ptr), + buf_size, struct_ptr->msg_chksum); } @@ -2677,10 +2677,10 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr, /* If the buffer will fit in the current ring buffer buffer with space * left over, just memcpy() it in and touch up the ring buffer - * fields accordingly. + * fields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -2708,15 +2708,15 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr, if ( is_end_trans == TRUE ) { (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num; - } + } HDassert( struct_ptr->cur_buf_free_space > 0 ); } else { /* Here, handle the case where the write will reach the edge - * of a ring buffer buffer. This gets a bit more complex, so - * for now at least, we will call H5C2_jb__write_to_buffer(). + * of a ring buffer buffer. This gets a bit more complex, so + * for now at least, we will call H5C2_jb__write_to_buffer(). * If this proves too costly, further optimizations will be necessary. */ @@ -2733,7 +2733,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb_bjf__write_buffer() */ - + /****************************************************************************** * @@ -2744,15 +2744,15 @@ done: * * Purpose: Write the checksum of a binary journal file message * to the ring buffer as eficiently as possible. Note - * that this checksum is computed only on the body of + * that this checksum is computed only on the body of * the message -- not the signature and version. * - * If there is space available in the current buffer in + * If there is space available in the current buffer in * the ring buffer is big enough, just write the chksum - * directly into the ring buffer buffer and update its - * fields accordingly. + * directly into the ring buffer buffer and update its + * fields accordingly. * - * If the chksum will cross ring buffer buffer boundaries, + * If the chksum will cross ring buffer buffer boundaries, * for now just call H5C2_jb__write_to_buffer(). * * Note that this function will probably prove to be @@ -2763,7 +2763,7 @@ done: * FAIL on failure. * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, uint64_t trans_num) { @@ -2775,7 +2775,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, /* Sanity check */ HDassert(struct_ptr != NULL); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - HDassert(trans_num > 0); + HDassert(trans_num > 0); if(!struct_ptr->chksum_cur_msg) HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "struct_ptr->chksum_cur_msg is false?!?!.") @@ -2783,11 +2783,11 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, if(H5C2__CHECKSUM_SIZE < struct_ptr->cur_buf_free_space) { /* If the checksum will fit in the current buffer with space - * left over, just write it directly into the buffer, and - * touch up the ring buffer fields accordingly. + * left over, just write it directly into the buffer, and + * touch up the ring buffer fields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -2825,17 +2825,17 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, uint8_t buf[H5C2__CHECKSUM_SIZE + 1]; /* Here, handle the case where the write will reach the edge - * of a buffer. This gets a bit more complex, so for now at - * least, we will construct a buffer containing a binary - * representation of the checksum, and then call - * H5C2_jb__write_to_buffer(). If this proves too costly, + * of a buffer. This gets a bit more complex, so for now at + * least, we will construct a buffer containing a binary + * representation of the checksum, and then call + * H5C2_jb__write_to_buffer(). If this proves too costly, * further optimizations will be necessary. */ p = buf; UINT32ENCODE(p, struct_ptr->msg_chksum); HDassert( p == &(buf[H5C2__CHECKSUM_SIZE]) ); - if(H5C2_jb__write_to_buffer(struct_ptr, H5C2__CHECKSUM_SIZE, + if(H5C2_jb__write_to_buffer(struct_ptr, H5C2__CHECKSUM_SIZE, (const char *)buf, is_end_trans, trans_num) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.") } /* end else */ @@ -2847,7 +2847,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, done: FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb_bjf__write_chksum() */ - + /****************************************************************************** * @@ -2856,15 +2856,15 @@ done: * Programmer: John Mainzer * 4/24/09 * - * Purpose: Write a HDF5 file length to the ring buffer as + * Purpose: Write a HDF5 file length to the ring buffer as * efficiently as possible. * - * If the space available in the current buffer in - * the ring buffer is big enough, just encode the - * lenght directly into the buffer and update its - * fields accordingly. + * If the space available in the current buffer in + * the ring buffer is big enough, just encode the + * lenght directly into the buffer and update its + * fields accordingly. * - * If the binary representation of the length will + * If the binary representation of the length will * touch buffer boundaries, create a buffer containing * the binary representation of the length, and then * call H5C2_jb__write_to_buffer() to handle the write. @@ -2883,7 +2883,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, size_t length, hbool_t is_end_trans, @@ -2897,7 +2897,7 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); - HDassert( trans_num > 0 ); + HDassert( trans_num > 0 ); /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE. * Throw an error if this invarient doesn't hold. @@ -2911,18 +2911,18 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, length_width = struct_ptr->length_width; - HDassert( ( length_width == 2 ) || - ( length_width == 4 ) || + HDassert( ( length_width == 2 ) || + ( length_width == 4 ) || ( length_width == 8 ) ); if ( length_width < struct_ptr->cur_buf_free_space ) { /* If the offset will fit in the current buffer with space - * left over, just write it directly into the buffer, and - * touch up the ring buffer fields accordingly. + * left over, just write it directly into the buffer, and + * touch up the ring buffer fields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -2961,9 +2961,9 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = - H5_checksum_metadata((const void *)(struct_ptr->head), - length_width, + struct_ptr->msg_chksum = + H5_checksum_metadata((const void *)(struct_ptr->head), + length_width, struct_ptr->msg_chksum); } @@ -2982,17 +2982,17 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, if ( is_end_trans == TRUE ) { (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num; - } + } HDassert( struct_ptr->cur_buf_free_space > 0 ); } else { /* Here, handle the case where the write will reach the edge - * of a buffer. This gets a bit more complex, so for now at - * least, we will construct a buffer containing a binary - * representation of the offset, and then call - * H5C2_jb__write_to_buffer(). If this proves too costly, + * of a buffer. This gets a bit more complex, so for now at + * least, we will construct a buffer containing a binary + * representation of the offset, and then call + * H5C2_jb__write_to_buffer(). If this proves too costly, * further optimizations will be necessary. */ @@ -3019,22 +3019,22 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr, } /* end switch */ HDassert( p == &(buf[length_width]) ); - if(H5C2_jb__write_to_buffer(struct_ptr, length_width, + if(H5C2_jb__write_to_buffer(struct_ptr, length_width, (const char *)buf, is_end_trans, trans_num) != SUCCEED) HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.") /* Update the check sum if required */ if(struct_ptr->chksum_cur_msg) - struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), - length_width, + struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), + length_width, struct_ptr->msg_chksum); } /* end else */ done: FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb_bjf__write_length() */ - + /****************************************************************************** * @@ -3043,15 +3043,15 @@ done: * Programmer: John Mainzer * 4/24/09 * - * Purpose: Write a HDF5 file offset to the ring buffer as + * Purpose: Write a HDF5 file offset to the ring buffer as * efficiently as possible. * - * If the space available in the current buffer in - * the ring buffer is big enough, just encode the - * offset directly into the buffer and update its - * fields accordingly. + * If the space available in the current buffer in + * the ring buffer is big enough, just encode the + * offset directly into the buffer and update its + * fields accordingly. * - * If the binary representation of the offset will + * If the binary representation of the offset will * touch buffer boundaries, create a buffer containing * the binary representation of the offset, and then * call H5C2_jb__write_to_buffer() to handle the write. @@ -3070,7 +3070,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, haddr_t offset, hbool_t is_end_trans, @@ -3085,11 +3085,11 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); /* eoa messages can be written outside transactions -- so it is - * possible that the trans_num will be 0. Since the trans_num is + * possible that the trans_num will be 0. Since the trans_num is * not used unless is_end_trans is TRUE, we make an exception for * the eoa message. */ - HDassert( ( ! is_end_trans ) || ( trans_num > 0 ) ); + HDassert( ( ! is_end_trans ) || ( trans_num > 0 ) ); /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE. * Throw an error if this invarient doesn't hold. @@ -3103,18 +3103,18 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, offset_width = struct_ptr->offset_width; - HDassert( ( offset_width == 2 ) || - ( offset_width == 4 ) || + HDassert( ( offset_width == 2 ) || + ( offset_width == 4 ) || ( offset_width == 8 ) ); if ( offset_width < struct_ptr->cur_buf_free_space ) { /* If the offset will fit in the current buffer with space - * left over, just write it directly into the buffer, and - * touch up the ring buffer fields accordingly. + * left over, just write it directly into the buffer, and + * touch up the ring buffer fields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -3153,9 +3153,9 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = - H5_checksum_metadata((const void *)(struct_ptr->head), - offset_width, + struct_ptr->msg_chksum = + H5_checksum_metadata((const void *)(struct_ptr->head), + offset_width, struct_ptr->msg_chksum); } @@ -3174,17 +3174,17 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, if ( is_end_trans == TRUE ) { (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num; - } + } HDassert( struct_ptr->cur_buf_free_space > 0 ); } else { /* Here, handle the case where the write will reach the edge - * of a buffer. This gets a bit more complex, so for now at - * least, we will construct a buffer containing a binary - * representation of the offset, and then call - * H5C2_jb__write_to_buffer(). If this proves too costly, + * of a buffer. This gets a bit more complex, so for now at + * least, we will construct a buffer containing a binary + * representation of the offset, and then call + * H5C2_jb__write_to_buffer(). If this proves too costly, * further optimizations will be necessary. */ @@ -3216,7 +3216,7 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, HDassert( p == &(buf[offset_width]) ); - if ( H5C2_jb__write_to_buffer(struct_ptr, offset_width, + if ( H5C2_jb__write_to_buffer(struct_ptr, offset_width, (const char *)buf, is_end_trans, trans_num) != SUCCEED ) { @@ -3227,8 +3227,8 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), - offset_width, + struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), + offset_width, struct_ptr->msg_chksum); } @@ -3239,7 +3239,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb_bjf__write_offset() */ - + /****************************************************************************** * @@ -3248,24 +3248,24 @@ done: * Programmer: John Mainzer * 4/24/09 * - * Purpose: Write the signature and version of a binary journal - * file message to the ring buffer as efficiently as + * Purpose: Write the signature and version of a binary journal + * file message to the ring buffer as efficiently as * possible. * - * If there is space available in the current buffer in - * the ring buffer is big enough, just memcpy the - * signature and write the version directly into the - * buffer and update its fields accordingly. + * If there is space available in the current buffer in + * the ring buffer is big enough, just memcpy the + * signature and write the version directly into the + * buffer and update its fields accordingly. * - * If the signature and version will cross buffer - * boundaries, for now just call + * If the signature and version will cross buffer + * boundaries, for now just call * H5C2_jb__write_to_buffer(). * * In either case, if keep_chksum is TRUE, initialize * struct_ptr->msg_chksum to 0, and set struct_ptr-> * chksum_cur_msg to TRUE. * - * Observe that the checksum does not include the + * Observe that the checksum does not include the * signature and version. * * Note that this function will probably prove to be @@ -3276,7 +3276,7 @@ done: * FAIL on failure. * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr, const uint8_t version, hbool_t keep_chksum, hbool_t is_end_trans, uint64_t trans_num) @@ -3290,21 +3290,21 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr, HDassert(sig_ptr); HDassert(H5C2_BJNL__SIG_LEN == HDstrlen(sig_ptr)); HDassert(!is_end_trans); - /* eoa messages can occur outside of transactions -- and thus it is - * possible that we will have to process one before any transaction + /* eoa messages can occur outside of transactions -- and thus it is + * possible that we will have to process one before any transaction * has started -- in which case trans_num will be 0. Since the trans_num - * isn't used unless is_end_trans is TRUE, we carve a small exception + * isn't used unless is_end_trans is TRUE, we carve a small exception * for the eoa message. */ HDassert((!is_end_trans) || (trans_num > 0)); if((H5C2_BJNL__SIG_LEN + 1) < struct_ptr->cur_buf_free_space) { - /* If the signature and version will fit in the current buffer - * with space left over, just memcpy()/write it in and touch up - * the ring bufferfields accordingly. + /* If the signature and version will fit in the current buffer + * with space left over, just memcpy()/write it in and touch up + * the ring bufferfields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -3329,7 +3329,7 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr, /* update end of buffer space */ struct_ptr->rb_space_to_rollover -= H5C2_BJNL__SIG_LEN + 1; - /* is_end_trans must be false in this call, so just throw an + /* is_end_trans must be false in this call, so just throw an * error if it is TRUE. */ if(is_end_trans) @@ -3341,14 +3341,14 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr, uint8_t buf[H5C2_BJNL__SIG_LEN + 2]; /* Here, handle the case where the write will reach the edge - * of a buffer. This gets a bit more complex, so for now at - * least, we will call H5C2_jb__write_to_buffer(). If this + * of a buffer. This gets a bit more complex, so for now at + * least, we will call H5C2_jb__write_to_buffer(). If this * proves too costly, further optimizations will be necessary. */ HDmemcpy(buf, (const void *)sig_ptr, H5C2_BJNL__SIG_LEN); buf[H5C2_BJNL__SIG_LEN] = version; - if(H5C2_jb__write_to_buffer(struct_ptr, H5C2_BJNL__SIG_LEN + 1, + if(H5C2_jb__write_to_buffer(struct_ptr, H5C2_BJNL__SIG_LEN + 1, (const char *)buf, is_end_trans, trans_num) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "H5C2_jb__write_to_buffer() failed.") } /* end else */ @@ -3364,7 +3364,7 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, const char *sig_ptr, done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb_bjf__write_sig_and_ver() */ - + /****************************************************************************** * @@ -3373,17 +3373,17 @@ done: * Programmer: John Mainzer * 4/24/09 * - * Purpose: Write the transaction number in a binary journal file + * Purpose: Write the transaction number in a binary journal file * message to the ring buffer as efficiently as possible. * - * If the space available in the current buffer in - * the ring buffer is big enough, just write the - * transaction number directly into the buffer and - * update its fields accordingly. + * If the space available in the current buffer in + * the ring buffer is big enough, just write the + * transaction number directly into the buffer and + * update its fields accordingly. * - * If the transaction will cross or touch buffer - * boundaries, construct binary representation of the - * transaction number in a buffer, and pass it to + * If the transaction will cross or touch buffer + * boundaries, construct binary representation of the + * transaction number in a buffer, and pass it to * H5C2_jb__write_to_buffer(). * * In either case, if struct_ptr->chksum_cur_msg is TRUE, @@ -3400,7 +3400,7 @@ done: * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, hbool_t is_end_trans, uint64_t trans_num) @@ -3412,7 +3412,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); - HDassert( trans_num > 0 ); + HDassert( trans_num > 0 ); /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE. * Throw an error if this invarient doesn't hold. @@ -3427,11 +3427,11 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, if ( H5C2__TRANS_NUM_SIZE < struct_ptr->cur_buf_free_space ) { /* If the transaction number will fit in the current buffer with space - * left over, just write it directly into the buffer, and touch up the - * ring buffer fields accordingly. + * left over, just write it directly into the buffer, and touch up the + * ring buffer fields accordingly. * - * This is the common case, so when we convert this function into - * a macro, this will allow us to avoid a function call in the vast + * This is the common case, so when we convert this function into + * a macro, this will allow us to avoid a function call in the vast * majority of cases. */ @@ -3450,9 +3450,9 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = - H5_checksum_metadata((const void *)(struct_ptr->head), - H5C2__TRANS_NUM_SIZE, + struct_ptr->msg_chksum = + H5_checksum_metadata((const void *)(struct_ptr->head), + H5C2__TRANS_NUM_SIZE, struct_ptr->msg_chksum); } @@ -3471,14 +3471,14 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, if ( is_end_trans == TRUE ) { (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num; - } + } HDassert( struct_ptr->cur_buf_free_space > 0 ); } else { /* Here, handle the case where the write will reach the edge - * of a buffer. This gets a bit more complex, so for now at + * of a buffer. This gets a bit more complex, so for now at * least, we will construct a buffer containing a binary representation * of the transaction number, and then call H5C2_jb__write_to_buffer(). * If this proves too costly, further optimizations will be necessary. @@ -3492,7 +3492,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, HDassert( p == &(buf[H5C2__TRANS_NUM_SIZE]) ); - if ( H5C2_jb__write_to_buffer(struct_ptr, H5C2__TRANS_NUM_SIZE, + if ( H5C2_jb__write_to_buffer(struct_ptr, H5C2__TRANS_NUM_SIZE, (const char *)buf, is_end_trans, trans_num) != SUCCEED ) { @@ -3503,8 +3503,8 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr, /* Update the check sum if required */ if ( struct_ptr->chksum_cur_msg ) { - struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), - H5C2__TRANS_NUM_SIZE, + struct_ptr->msg_chksum = H5_checksum_metadata((const void *)(buf), + H5C2__TRANS_NUM_SIZE, struct_ptr->msg_chksum); } @@ -3530,8 +3530,8 @@ done: * ******************************************************************************/ -herr_t -H5C2_jb__bin2hex(const uint8_t * buf, +herr_t +H5C2_jb__bin2hex(const uint8_t * buf, char * hexdata, size_t * hexlength, size_t buf_size) @@ -3540,7 +3540,7 @@ H5C2_jb__bin2hex(const uint8_t * buf, size_t v; /* Local index variable */ uint8_t c; char * t; - + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C2_jb__bin2hex) t = hexdata; @@ -3570,16 +3570,16 @@ H5C2_jb__bin2hex(const uint8_t * buf, * Programmer: Mike McGreevy <mcgreevy@hdfgroup.org> * Wednesday, February 6, 2008 * - * Purpose: Insert the supplied comment in the journal file. This - * call may be ignored if the journal file is machine + * Purpose: Insert the supplied comment in the journal file. This + * call may be ignored if the journal file is machine * readable. * * Returns: SUCCEED on success. * * Changes: Turned this function into a switch board function, - * calling either the human readable or the binary - * journal file version of the function as indicated - * by struct_ptr->human_readable. + * calling either the human readable or the binary + * journal file version of the function as indicated + * by struct_ptr->human_readable. * * The original version of this file has been renamed * to H5C2_jb_hrjf__comment(). @@ -3588,14 +3588,14 @@ H5C2_jb__bin2hex(const uint8_t * buf, * ******************************************************************************/ -herr_t +herr_t H5C2_jb__comment(H5C2_jbrb_t * struct_ptr, const char * comment_ptr) { herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb__comment, FAIL) - + /* Check Arguments */ HDassert( struct_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); @@ -3632,7 +3632,7 @@ done: * Wednesday, February 6, 2008 * * Purpose: Verify that the supplied transaction is in progress, - * and that at least one journal entry has been written + * and that at least one journal entry has been written * under it. Then construct an end transaction message, * and write it to the current journal buffer. Make note * that the supplied transaction is closed, and that no @@ -3641,9 +3641,9 @@ done: * Returns: SUCCEED on success. * * Changes: Turned this function into a switch board function, - * calling either the human readable or the binary - * journal file version of the function as indicated - * by struct_ptr->human_readable. + * calling either the human readable or the binary + * journal file version of the function as indicated + * by struct_ptr->human_readable. * * The original version of this file has been renamed * to H5C2_jb_hrjf__end_transaction(). @@ -3679,9 +3679,9 @@ H5C2_jb__end_transaction(H5C2_jbrb_t * struct_ptr, "H5C2_jb_bjf__end_transaction() failed.") } } - + done: - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb__end_transaction */ @@ -3699,9 +3699,9 @@ done: * Returns: SUCCEED on success. * * Changes: Turned this function into a switch board function, - * calling either the human readable or the binary - * journal file version of the function as indicated - * by struct_ptr->human_readable. + * calling either the human readable or the binary + * journal file version of the function as indicated + * by struct_ptr->human_readable. * * The original version of this file has been renamed * to H5C2_jb_hrjf__eoa(). @@ -3710,14 +3710,14 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr, haddr_t eoa) { herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb__eoa, FAIL) - + /* Check Arguments */ HDassert( struct_ptr ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); @@ -3762,7 +3762,7 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) { int result; @@ -3774,7 +3774,7 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - + /* Check if transaction is in progress */ if (struct_ptr->trans_in_prog != FALSE) { @@ -3786,8 +3786,8 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) if (struct_ptr->get > struct_ptr->put) { /* write from get through end of buffer */ - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[struct_ptr->get], + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[struct_ptr->get], (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size); if ( result == -1 ) { @@ -3795,18 +3795,18 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \ "Journal file write failed(1).") } - + struct_ptr->bufs_in_use -= (struct_ptr->num_bufs - struct_ptr->get); struct_ptr->rb_free_space += (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size; struct_ptr->get = 0; - + } /* end if */ if (struct_ptr->get < struct_ptr->put) { /* write from get up to, but not including, put */ - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[struct_ptr->get], + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[struct_ptr->get], (struct_ptr->put - struct_ptr->get) * struct_ptr->buf_size); if ( result == -1 ) { @@ -3824,8 +3824,8 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) if ( struct_ptr->cur_buf_free_space != struct_ptr->buf_size ) { /* flush partially filled portion of current journal buffer to disk */ - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[struct_ptr->put], + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[struct_ptr->put], struct_ptr->buf_size - struct_ptr->cur_buf_free_space); if ( result == -1 ) { @@ -3849,19 +3849,19 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr) HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Journal file sync failed.") /* record last transaction number that made it to disk */ - struct_ptr->last_trans_on_disk = + struct_ptr->last_trans_on_disk = (*struct_ptr->trans_tracking)[struct_ptr->put]; - /* MIKE: optimization note: don't reset to top of ring buffer. - * instead, keep filling out current buffer so we can keep writes - * on block boundaries. + /* MIKE: optimization note: don't reset to top of ring buffer. + * instead, keep filling out current buffer so we can keep writes + * on block boundaries. */ struct_ptr->cur_buf_free_space = struct_ptr->buf_size; struct_ptr->rb_space_to_rollover = struct_ptr->num_bufs * struct_ptr->buf_size; struct_ptr->head = (*struct_ptr->buf)[0]; struct_ptr->put = 0; - /* Propogate the last transaction on in the buffers throughout the + /* Propogate the last transaction on in the buffers throughout the * transaction tracking array. */ for(i = 0; i < struct_ptr->num_bufs; i++) (*struct_ptr->trans_tracking)[i] = struct_ptr->last_trans_on_disk; @@ -3881,17 +3881,17 @@ done: * Programmer: Mike McGreevy <mcgreevy@hdfgroup.org> * Wednesday, February 6, 2008 * - * Purpose: Flush all the dirtied buffers in the ring buffer - * starting with the buffer referenced by struct_ptr->get + * Purpose: Flush all the dirtied buffers in the ring buffer + * starting with the buffer referenced by struct_ptr->get * and ending with the buffer right before the one - * referenced by struct_ptr->put. + * referenced by struct_ptr->put. * * Returns: SUCCEED on success. * ******************************************************************************/ -herr_t -H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) +herr_t +H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) { int result; herr_t ret_value = SUCCEED; @@ -3907,12 +3907,12 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) /* flush all full, dirtied journal buffers to disk */ if (struct_ptr->get < struct_ptr->put) { - /* can write solid chunk from get up to, but not - * including, put + /* can write solid chunk from get up to, but not + * including, put */ - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[struct_ptr->get], - (struct_ptr->put - struct_ptr->get) * + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[struct_ptr->get], + (struct_ptr->put - struct_ptr->get) * struct_ptr->buf_size); if ( result == -1 ) { @@ -3929,8 +3929,8 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) else { /* write from get through end of buffer */ - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[struct_ptr->get], + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[struct_ptr->get], (struct_ptr->num_bufs - struct_ptr->get) * struct_ptr->buf_size); if ( result == -1 ) { @@ -3946,12 +3946,12 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) /* if put = 0, then everything that needs to be flushed will have been * flushed, so we can stop here. Otherwise, need to flush all buffers * from the start of the ring buffer's allocated space up to, but not - * including, the buffer indexed by put. + * including, the buffer indexed by put. */ if (struct_ptr->put != 0) { - result = HDwrite(struct_ptr->journal_file_fd, - (*struct_ptr->buf)[0], + result = HDwrite(struct_ptr->journal_file_fd, + (*struct_ptr->buf)[0], (struct_ptr->put) * struct_ptr->buf_size); if ( result == -1 ) { @@ -3967,21 +3967,21 @@ H5C2_jb__flush_full_buffers(H5C2_jbrb_t * struct_ptr) struct_ptr->bufs_in_use -= struct_ptr->put; } /* end else */ - + HDassert(struct_ptr->bufs_in_use <= 1); /* update get index */ struct_ptr->get = struct_ptr->put; - + /* record last transaction number that made it to disk */ if (struct_ptr->put == 0) { - struct_ptr->last_trans_on_disk = + struct_ptr->last_trans_on_disk = (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1]; } else { - struct_ptr->last_trans_on_disk = + struct_ptr->last_trans_on_disk = (*struct_ptr->trans_tracking)[struct_ptr->put - 1]; } @@ -4008,20 +4008,20 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr, uint64_t * trans_num_ptr) { herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb__get_last_transaction_on_disk, FAIL) - + /* Check Arguments */ HDassert( struct_ptr != NULL ); HDassert( trans_num_ptr != NULL ); HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC ); - /* JRM: In machine readable version, lets check to see if a sync is + /* JRM: In machine readable version, lets check to see if a sync is * necessary, and call it only if it is. */ /* perform a sync to ensure everything gets to disk before continuing */ @@ -4044,19 +4044,19 @@ done: * Programmer: Mike McGreevy <mcgreevy@hdfgroup.org> * Wednesday, February 6, 2008 * - * Purpose: Insert the supplied comment in the journal file. This - * call may be ignored if the journal file is machine + * Purpose: Insert the supplied comment in the journal file. This + * call may be ignored if the journal file is machine * readable. * * Returns: SUCCEED on success. * - * Changes: Renamed H5C2_jb__comment() to H5C2_jb_hrjf__comment(). + * Changes: Renamed H5C2_jb__comment() to H5C2_jb_hrjf__comment(). * * JRM -- 5/2/09 * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr, const char * comment_ptr) { @@ -4065,15 +4065,15 @@ H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr, herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb_hrjf__comment, FAIL) - + /* Check Arguments */ HDassert(struct_ptr); HDassert(comment_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); HDassert(struct_ptr->hdf5_file_name); - /* Verify that header message is present in journal file or ring buffer. - * If not, write it. + /* Verify that header message is present in journal file or ring buffer. + * If not, write it. */ if ( struct_ptr->header_present == FALSE ) { @@ -4116,7 +4116,7 @@ done: * Wednesday, February 6, 2008 * * Purpose: Verify that the supplied transaction is in progress, - * and that at least one journal entry has been written + * and that at least one journal entry has been written * under it. Then construct an end transaction message, * and write it to the current journal buffer. Make note * that the supplied transaction is closed, and that no @@ -4125,7 +4125,7 @@ done: * Returns: SUCCEED on success. * * Changes: Renamed H5C2_jb__end_transaction() to - * H5C2_jb_hrjf__end_transaction(). + * H5C2_jb_hrjf__end_transaction(). * JRM -- 5/2/09 * *****************************************************************************/ @@ -4142,7 +4142,7 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr, /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - + /* Verify that the supplied transaction is in progress */ if ( ( struct_ptr->trans_in_prog != TRUE ) || ( struct_ptr->cur_trans != trans_num ) ) { @@ -4150,9 +4150,9 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "Transaction not in progress or bad transaction number.") } /* end if */ - - /* Verify that at least one journal entry has been written under - * the current transaction + + /* Verify that at least one journal entry has been written under + * the current transaction */ if ( struct_ptr->jentry_written != TRUE ) { @@ -4165,15 +4165,15 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr, HDsnprintf(temp, (size_t)25, "3 end_trans %llu\n", trans_num); /* Write end transaction message */ - if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, + if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, TRUE, trans_num ) < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ "H5C2_jb__write_to_buffer() failed.\n") } /* end if */ - /* reset boolean flag indicating if at least one journal entry has - * been written under transaction + /* reset boolean flag indicating if at least one journal entry has + * been written under transaction */ struct_ptr->jentry_written = FALSE; @@ -4181,7 +4181,7 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr, struct_ptr->trans_in_prog = FALSE; done: - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb_hrjf__end_transaction */ @@ -4198,12 +4198,12 @@ done: * * Returns: SUCCEED on success. * - * Changes: Renamed H5C2_jb__eoa() to H5C2_jb_hrjf__eoa(). + * Changes: Renamed H5C2_jb__eoa() to H5C2_jb_hrjf__eoa(). * JRM -- 5/2/09 * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr, haddr_t eoa) { @@ -4212,14 +4212,14 @@ H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr, herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(H5C2_jb_hrjf__eoa, FAIL) - + /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); HDassert(struct_ptr->hdf5_file_name); - /* Verify that header message is present in journal file or ring buffer. - * If not, write it. + /* Verify that header message is present in journal file or ring buffer. + * If not, write it. */ if(struct_ptr->header_present == FALSE ) { if(H5C2_jb__write_header_entry(struct_ptr) != SUCCEED) @@ -4254,13 +4254,13 @@ done: * * Returns: SUCCEED on success. * - * Changes: Renamed H5C2_jb__journal_entry() to - * H5C2_jb_hrjf__journal_entry(). + * Changes: Renamed H5C2_jb__journal_entry() to + * H5C2_jb_hrjf__journal_entry(). * JRM -- 5/2/09 * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr, uint64_t trans_num, haddr_t base_addr, @@ -4288,7 +4288,7 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr, } HDmemcpy(bodydata, body, length); - + /* Verify that the supplied transaction is in progress */ if ( ( struct_ptr->trans_in_prog != TRUE ) || ( struct_ptr->cur_trans != trans_num ) ) { @@ -4310,11 +4310,11 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr, } /* Write journal entry */ - HDsnprintf(temp, + HDsnprintf(temp, (size_t)(length + 100), - "2 trans_num %llu length %zu base_addr 0x%lx body ", - trans_num, - length, + "2 trans_num %llu length %zu base_addr 0x%lx body ", + trans_num, + length, (unsigned long)base_addr); if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, trans_num) < 0 ) { @@ -4332,8 +4332,8 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr, "H5C2_jb__write_to_buffer() failed.\n") } /* end if */ - /* Indicate that at least one journal entry has been written under - * this transaction + /* Indicate that at least one journal entry has been written under + * this transaction */ if ( struct_ptr->jentry_written == FALSE ) { @@ -4372,21 +4372,21 @@ done: * Wednesday, February 6, 2008 * * Purpose: Verify that there is no transaction in progress, and - * that the supplied transaction number greater than - * the last. Then construct a start transaction message, + * that the supplied transaction number greater than + * the last. Then construct a start transaction message, * and write it to the current journal buffer. Make note * of the fact that the supplied transaction is in * progress. * * Returns: SUCCEED on success. * - * Changes: Renamed H5C2_jb__start_transaction() to - * H5C2_jb_hrjf__start_transaction(). + * Changes: Renamed H5C2_jb__start_transaction() to + * H5C2_jb_hrjf__start_transaction(). * JRM -- 5/2/09 * ******************************************************************************/ -static herr_t +static herr_t H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr, uint64_t trans_num) @@ -4399,7 +4399,7 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr, /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - + /* Verify that there is no transaction in progress */ if ( struct_ptr->trans_in_prog != FALSE ) { @@ -4407,7 +4407,7 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr, "Transaction already in progress.") } /* end if */ - /* JRM: Heads up: we may relax this constraint to rquire that the + /* JRM: Heads up: we may relax this constraint to rquire that the * new transaction number is greater than the old, but possibly * not the next integer in sequence. Will this cause problems * with testing? @@ -4420,8 +4420,8 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr, "New transaction out of sequence.") } /* end if */ - /* Verify that header message is present in journal file or ring buffer. - * If not, write it. + /* Verify that header message is present in journal file or ring buffer. + * If not, write it. */ if ( struct_ptr->header_present == FALSE ) { @@ -4435,19 +4435,19 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr, /* Write start transaction message */ HDsnprintf(temp, (size_t)150, "1 bgn_trans %llu\n", trans_num); - if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, + if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, FALSE, trans_num) < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ "H5C2_jb__write_to_buffer() failed.\n") } /* end if */ - + /* Make note of the fact that supplied transaction is in progress */ struct_ptr->trans_in_prog = TRUE; struct_ptr->cur_trans = trans_num; done: - + FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb_hrjf__start_transaction() */ @@ -4472,26 +4472,26 @@ done: * Added the journal_magic parameter and related code. * * Also deleted code to write the header message. - * Since the base address of the journal magic in + * Since the base address of the journal magic in * the HDF5 file isn't available at this time, wait * until our first real entry to write the header. * * JRM -- 4/16/09 * Added the sizeof_addr and sizeof_size parameters, and - * associated code. These parameters must contain the + * associated code. These parameters must contain the * values of the same name in the instance of H5F_file_t * associated with the target file. * ******************************************************************************/ -herr_t -H5C2_jb__init(H5C2_jbrb_t * struct_ptr, +herr_t +H5C2_jb__init(H5C2_jbrb_t * struct_ptr, const int32_t journal_magic, - const char * HDF5_file_name, - const char * journal_file_name, - size_t buf_size, - int num_bufs, - hbool_t use_aio, + const char * HDF5_file_name, + const char * journal_file_name, + size_t buf_size, + int num_bufs, + hbool_t use_aio, hbool_t human_readable, size_t sizeof_addr, size_t sizeof_size) @@ -4537,7 +4537,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \ "allocation of space for copy of journal_file_name failed."); - } + } struct_ptr->hdf5_file_name = HDstrdup(HDF5_file_name); @@ -4545,7 +4545,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \ "allocation of space for copy of HDF5_file_name failed."); - } + } struct_ptr->header_present = FALSE; struct_ptr->cur_buf_free_space = buf_size; @@ -4555,9 +4555,9 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, struct_ptr->trans_tracking = NULL; struct_ptr->buf = NULL; - + /* Open journal file */ - struct_ptr->journal_file_fd = + struct_ptr->journal_file_fd = HDopen(journal_file_name, O_WRONLY|O_CREAT|O_EXCL, 0777); if ( struct_ptr->journal_file_fd == -1) { @@ -4566,7 +4566,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, "Can't create journal file. Does it already exist?") } /* end if */ - + /* Allocate space for the ring buffer's journal buffer pointers */ struct_ptr->buf = H5MM_malloc(struct_ptr->num_bufs * sizeof(char *)); @@ -4575,9 +4575,9 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \ "allocation of buf pointer array failed."); } /* end if */ - + /* Allocate space for journal buffers */ - (*struct_ptr->buf)[0] = + (*struct_ptr->buf)[0] = H5MM_malloc(struct_ptr->buf_size * struct_ptr->num_bufs); if ( (*struct_ptr->buf)[0] == NULL ) { @@ -4586,10 +4586,10 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, "allocation of buffers failed."); } /* end if */ - /* Allocate space for the purposes of tracking the last - * transaction on disk + /* Allocate space for the purposes of tracking the last + * transaction on disk */ - struct_ptr->trans_tracking = + struct_ptr->trans_tracking = H5MM_malloc(struct_ptr->num_bufs * sizeof(unsigned long)); if ( struct_ptr->trans_tracking == NULL ) { @@ -4597,19 +4597,19 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \ "allocation of trans_tracking failed."); } /* end if */ - + /* Initialize the transaction tracking array */ for (i=0; i<struct_ptr->num_bufs; i++) { (*struct_ptr->trans_tracking)[i] = 0; } - - /* Make journal buffer pointers point to the right location in - * chunk of allocated memory above + + /* Make journal buffer pointers point to the right location in + * chunk of allocated memory above */ for ( i = 1; i < struct_ptr->num_bufs; i++ ) { - (*struct_ptr->buf)[i] = + (*struct_ptr->buf)[i] = &((*struct_ptr->buf)[0])[i * struct_ptr->buf_size]; } @@ -4617,7 +4617,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr, struct_ptr->head = (*struct_ptr->buf)[struct_ptr->put]; done: - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5C2_jb__init */ @@ -4638,9 +4638,9 @@ done: * Returns: SUCCEED on success. * * Changes: Turned this function into a switch board function, - * calling either the human readable or the binary - * journal file version of the function as indicated - * by struct_ptr->human_readable. + * calling either the human readable or the binary + * journal file version of the function as indicated + * by struct_ptr->human_readable. * * The original version of this file has been renamed * to H5C2_jb_hrjf__journal_entry(). @@ -4649,7 +4649,7 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr, uint64_t trans_num, haddr_t base_addr, @@ -4666,7 +4666,7 @@ H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr, if ( struct_ptr->human_readable ) { - if ( H5C2_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr, + if ( H5C2_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr, length, body) != SUCCEED ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -4697,8 +4697,8 @@ done: * Wednesday, February 6, 2008 * * Purpose: Verify that there is no transaction in progress, and - * that the supplied transaction number greater than - * the last. Then construct a start transaction message, + * that the supplied transaction number greater than + * the last. Then construct a start transaction message, * and write it to the current journal buffer. Make note * of the fact that the supplied transaction is in * progress. @@ -4706,9 +4706,9 @@ done: * Returns: SUCCEED on success. * * Changes: Turned this function into a switch board function, - * calling either the human readable or the binary - * journal file version of the function as indicated - * by struct_ptr->human_readable. + * calling either the human readable or the binary + * journal file version of the function as indicated + * by struct_ptr->human_readable. * * The original version of this file has been renamed * to H5C2_jb_hrjf__start_transaction(). @@ -4717,7 +4717,7 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr, uint64_t trans_num) @@ -4732,7 +4732,7 @@ H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr, if ( struct_ptr->human_readable ) { - if ( H5C2_jb_hrjf__start_transaction(struct_ptr, trans_num) + if ( H5C2_jb_hrjf__start_transaction(struct_ptr, trans_num) != SUCCEED ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -4740,16 +4740,16 @@ H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr, } } else { - if ( H5C2_jb_bjf__start_transaction(struct_ptr, trans_num) + if ( H5C2_jb_bjf__start_transaction(struct_ptr, trans_num) != SUCCEED ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ "H5C2_jb_bjf__start_transaction() failed.") } } - + done: - + FUNC_LEAVE_NOAPI(ret_value) } /* H5C2_jb__start_transaction() */ @@ -4765,31 +4765,31 @@ done: * Purpose: Verify that the journal buffers are empty, and that the * journal file has been truncated. Then close and delete * the journal file associated with *struct_ptr, and free - * all dynamically allocated memory associated with + * all dynamically allocated memory associated with * *struct_ptr. * * Returns: SUCCEED on success. * ******************************************************************************/ -herr_t +herr_t H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr) { herr_t ret_value = SUCCEED; - + FUNC_ENTER_NOAPI(H5C2_jb__takedown, FAIL) /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - + /* Verify that the journal buffers are empty */ if ( struct_ptr->bufs_in_use != 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "Attempt to takedown with non-empty buffers.") - } /* end if */ + } /* end if */ /* Verify that the journal file has been truncated */ if (struct_ptr->journal_is_empty != TRUE) { @@ -4878,7 +4878,7 @@ done: * Programmer: Mike McGreevy <mcgreevy@hdfgroup.org> * Thursday, February 7, 2008 * - * Purpose: Verify that there is no transaction in progress, and + * Purpose: Verify that there is no transaction in progress, and * that the journal entry buffers are empty. Truncate * the journal file. Does not return until the file * is truncated on disk. @@ -4887,7 +4887,7 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr) { @@ -4899,7 +4899,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr) /* Check Arguments */ HDassert(struct_ptr); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - + /* Verify that there is no transaction in progress */ if ( struct_ptr->trans_in_prog != FALSE ) { @@ -4912,7 +4912,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr) HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ "Attempt to truncate with non-empty buffers.") - } /* end if */ + } /* end if */ /* Truncate the journal file */ if ( HDftruncate(struct_ptr->journal_file_fd, (off_t)0) < 0 ) { @@ -4927,7 +4927,7 @@ H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr) /* reset the transaction number fields */ struct_ptr->cur_trans = 0; struct_ptr->last_trans_on_disk = 0; - + /* reset the transaction tracking array */ for (i=0; i<struct_ptr->num_bufs; i++) { @@ -4954,21 +4954,21 @@ done: * 2/12/09 * * Purpose: Write the header message to the journal file. - * + * * This message appear exactly once in every journal * file, and is always the first message in the file. - * It identifies the journal file, and contains - * information required to run the journal, should + * It identifies the journal file, and contains + * information required to run the journal, should * that be necessary. * * It is always in human readable format. - * + * * Returns: SUCCEED on success. * FAIL on failure. * * Changes: JRM -- 3/21/09 - * Moved the entry tag strings into #defines. - * Replaced all white space in the creation date + * Moved the entry tag strings into #defines. + * Replaced all white space in the creation date * string with underscores. * * JRM -- 4/16/09 @@ -4977,7 +4977,7 @@ done: * ******************************************************************************/ -herr_t +herr_t H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) { @@ -4990,7 +4990,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) size_t file_name_len; size_t buf_len; time_t current_date; - + FUNC_ENTER_NOAPI(H5C2_jb__write_header_entry, FAIL) /* Check Arguments */ @@ -5005,7 +5005,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) HDassert( file_name_len > 0 ); buf_len = file_name_len + 256; - + /* Allocate space for journal buffers */ buf = H5MM_malloc(buf_len); @@ -5014,7 +5014,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \ "buffer allocation failed."); } /* end if */ - + /* Get the current date */ current_date = HDtime(NULL); @@ -5030,7 +5030,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) } else { - /* copy the string into time_buf, replacing white space with + /* copy the string into time_buf, replacing white space with * underscores. * * Do this to make parsing the header easier. @@ -5059,14 +5059,14 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) if ( struct_ptr->human_readable ) { - chars_written = - HDsnprintf(buf, + chars_written = + HDsnprintf(buf, buf_len - 1, "0 %s %ld %s %s %s %d %s %10.10s %s %d\n", H5C2_JNL__VER_NUM_TAG, - struct_ptr->jvers, + struct_ptr->jvers, H5C2_JNL__TGT_FILE_NAME_TAG, - struct_ptr->hdf5_file_name, + struct_ptr->hdf5_file_name, H5C2_JNL__JNL_MAGIC_TAG, (int)(struct_ptr->journal_magic), H5C2_JNL__CREATION_DATE_TAG, @@ -5076,24 +5076,24 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) } else { - /* Only include the offset and length widths in header for a binary - * journal file. Leave this data out of the human readable journal + /* Only include the offset and length widths in header for a binary + * journal file. Leave this data out of the human readable journal * file header because: * - * 1) Everything is in ASCII so it isn't needed, and + * 1) Everything is in ASCII so it isn't needed, and * - * 2) If we included it anyway, we would have to update the + * 2) If we included it anyway, we would have to update the * tests for the human readable journal file code. */ - chars_written = - HDsnprintf(buf, + chars_written = + HDsnprintf(buf, buf_len - 1, "0 %s %ld %s %s %s %d %s %10.10s %s %d %s %d %s %d\n", H5C2_JNL__VER_NUM_TAG, - struct_ptr->jvers, + struct_ptr->jvers, H5C2_JNL__TGT_FILE_NAME_TAG, - struct_ptr->hdf5_file_name, + struct_ptr->hdf5_file_name, H5C2_JNL__JNL_MAGIC_TAG, (int)(struct_ptr->journal_magic), H5C2_JNL__CREATION_DATE_TAG, @@ -5116,7 +5116,7 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr) HDassert( HDstrlen(buf) < buf_len ); /* Write the header message into the ring buffer */ - if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, + if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, (uint64_t)0) < 0) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ @@ -5146,7 +5146,7 @@ done: * Wednesday, February 6, 2008 * * Purpose: Put the contents of data into the journal buffers. This - * is done as follows: While the data to be written is + * is done as follows: While the data to be written is * larger than the amount of space left in the ring buffer, * the ring buffer is filled to capacity with data and * flushed. This repeats until the unwritten data remaining @@ -5155,18 +5155,18 @@ done: * * At this point, the rest of the data can just be written * without having to break it up further. In the event - * the data covers more than one journal buffer, the get - * and put indices are updated to state this fact. Any - * journal buffers that were filled during the write are + * the data covers more than one journal buffer, the get + * and put indices are updated to state this fact. Any + * journal buffers that were filled during the write are * flushed. * * Returns: SUCCEED on success. * ******************************************************************************/ -herr_t -H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, - size_t size, +herr_t +H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, + size_t size, const char * data, hbool_t is_end_trans, uint64_t trans_num) @@ -5175,26 +5175,26 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, unsigned long track_last_trans = 0; int oldput = 0; int i; - + FUNC_ENTER_NOAPI(H5C2_jb__write_to_buffer, FAIL) /* Check Arguments */ HDassert(struct_ptr); HDassert(data); HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC); - HDassert( ( struct_ptr->human_readable == FALSE ) || + HDassert( ( struct_ptr->human_readable == FALSE ) || ( HDstrlen(data) == size ) ); - HDassert(struct_ptr->rb_space_to_rollover <= + HDassert(struct_ptr->rb_space_to_rollover <= struct_ptr->num_bufs * struct_ptr->buf_size); - HDassert(struct_ptr->rb_space_to_rollover > 0); + HDassert(struct_ptr->rb_space_to_rollover > 0); - /* If the data size exceeds the bounds of the ring buffer's allocated - * memory, loop around to top + /* If the data size exceeds the bounds of the ring buffer's allocated + * memory, loop around to top */ if (size >= struct_ptr->rb_space_to_rollover) { while (size >= struct_ptr->rb_space_to_rollover) { - + /* Assertions */ HDassert(size != 0); HDassert( ( struct_ptr->human_readable == FALSE ) || @@ -5202,13 +5202,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, /* fill up remaining space in the ring buffer */ HDmemcpy(struct_ptr->head, data, struct_ptr->rb_space_to_rollover); - + /* move head to point to start of ring buffer */ struct_ptr->head = (*struct_ptr->buf)[0]; /* make note of last transaction on disk */ track_last_trans = (*struct_ptr->trans_tracking)[struct_ptr->put]; - + /* update rb_free_space */ struct_ptr->rb_free_space -= struct_ptr->rb_space_to_rollover; @@ -5230,8 +5230,8 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, then update it */ if ((size == struct_ptr->rb_space_to_rollover) && (is_end_trans == TRUE)) { - - (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1] + + (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1] = trans_num; (*struct_ptr->trans_tracking)[0] = trans_num; } @@ -5246,13 +5246,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, /* update remaining size of data to be written */ size = size - struct_ptr->rb_space_to_rollover; - /* update the data pointer to point to the remaining data to be - * written + /* update the data pointer to point to the remaining data to be + * written */ data = &data[struct_ptr->rb_space_to_rollover]; /* update the amount of space left at end of ring buffer */ - struct_ptr->rb_space_to_rollover = + struct_ptr->rb_space_to_rollover = struct_ptr->buf_size * struct_ptr->num_bufs; /* update the amount of space in the current buffer */ @@ -5260,9 +5260,9 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, } /* end while */ } /* end if */ - - /* If the size of the data exceeds the bounds of a single journal - * buffer, will write into multiple + + /* If the size of the data exceeds the bounds of a single journal + * buffer, will write into multiple */ if (size > struct_ptr->cur_buf_free_space) { @@ -5282,11 +5282,11 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, struct_ptr->rb_free_space -= size; /* update put index */ - struct_ptr->put += - (size-struct_ptr->cur_buf_free_space)/(struct_ptr->buf_size) + 1; + struct_ptr->put += + (size-struct_ptr->cur_buf_free_space)/(struct_ptr->buf_size) + 1; - /* Drag the last transaction in a filled buffer value residing in the - old put location through the trans_tracking array to the new + /* Drag the last transaction in a filled buffer value residing in the + old put location through the trans_tracking array to the new corresponding put position. */ for (i=oldput; i<struct_ptr->put+1; i++) { @@ -5294,9 +5294,9 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, } /* update current buffer usage */ - struct_ptr->cur_buf_free_space = - struct_ptr->rb_space_to_rollover - size - - (struct_ptr->num_bufs - (struct_ptr->put + 1)) * + struct_ptr->cur_buf_free_space = + struct_ptr->rb_space_to_rollover - size - + (struct_ptr->num_bufs - (struct_ptr->put + 1)) * (struct_ptr->buf_size ); /* update bufs_in_use as necessary */ @@ -5309,7 +5309,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, /* check to see if trans_tracking needs to be updated. If so, then update it */ if (is_end_trans == TRUE) { - + if (struct_ptr->cur_buf_free_space == struct_ptr->buf_size) { (*struct_ptr->trans_tracking)[struct_ptr->put - 1] = trans_num; } @@ -5331,13 +5331,13 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, } /* end if */ - /* if the data can fit in the remaining space in the current journal - * buffer indexed by put + /* if the data can fit in the remaining space in the current journal + * buffer indexed by put */ else if (size > 0) { HDassert(size <= struct_ptr->cur_buf_free_space); - + /* write data into journal buffer */ HDmemcpy(struct_ptr->head, data, size); @@ -5358,17 +5358,17 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, /* update end of buffer space */ struct_ptr->rb_space_to_rollover -= size; - + /* check to see if trans_tracking needs to be updated. If so, then update it */ if (is_end_trans == TRUE) { - - (*struct_ptr->trans_tracking)[struct_ptr->put] + + (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num; } /* end if */ - /* if buffer is full, flush it, and loop to the top of the - * ring buffer if at the end. + /* if buffer is full, flush it, and loop to the top of the + * ring buffer if at the end. */ if (struct_ptr->cur_buf_free_space == 0) { @@ -5380,18 +5380,18 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, (*struct_ptr->trans_tracking)[struct_ptr->put - 1]; } /* end if */ - + else { struct_ptr->put = 0; /* Drag trans_tracking value into next buffer */ - (*struct_ptr->trans_tracking)[0] + (*struct_ptr->trans_tracking)[0] = (*struct_ptr->trans_tracking)[struct_ptr->num_bufs - 1]; /* reset head pointer and free space values */ struct_ptr->head = (*struct_ptr->buf)[0]; - struct_ptr->rb_space_to_rollover = + struct_ptr->rb_space_to_rollover = struct_ptr->buf_size * struct_ptr->num_bufs; } /* end else */ @@ -5407,7 +5407,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, } /* end if */ } /* end else */ - + HDassert(struct_ptr->bufs_in_use <= struct_ptr->num_bufs); done: diff --git a/src/H5C2pkg.h b/src/H5C2pkg.h index 2c49200..f706dbc 100644 --- a/src/H5C2pkg.h +++ b/src/H5C2pkg.h @@ -61,19 +61,19 @@ * The fields of this structure are discussed below: * * - * magic: Unsigned 32-bit integer always set to - * H5C2__H5C2_JBRB_T_MAGIC. This field is used to + * magic: Unsigned 32-bit integer always set to + * H5C2__H5C2_JBRB_T_MAGIC. This field is used to * validate pointers to instances of H5C_jbrb_t. * * journal_magic: int32_t used to store a randomly selected integer - * used to tag both the journal file and the - * mdj_config_block. Should the journal ever be - * run, we will check to see if the magic number - * from the target HDF5 file matches that in the + * used to tag both the journal file and the + * mdj_config_block. Should the journal ever be + * run, we will check to see if the magic number + * from the target HDF5 file matches that in the * journal, and refuse to run the journal if it does * not. * - * journal_file_fd: File Descriptor of the journal file that is being + * journal_file_fd: File Descriptor of the journal file that is being * written to from this ring buffer. * * num_bufs: The number of journal buffers in the ring buffer. This @@ -96,7 +96,7 @@ * of the formatting changes of the journal file. * * get: Number of the journal buffer that is next in line to - * be written to disk. (i.e. the least recently dirtied + * be written to disk. (i.e. the least recently dirtied * journal buffer). * * put: Number of the journal buffer that is currently being @@ -111,25 +111,25 @@ * human_readable: Boolean flag that indicates whether the journal file * is to be human readable or machine readable. * - * offset_width: If human_readable is FALSE, this field contains the - * width of offsets in the HDF5 file in bytes (as - * specified in the superblock -- sizeof_addr in + * offset_width: If human_readable is FALSE, this field contains the + * width of offsets in the HDF5 file in bytes (as + * specified in the superblock -- sizeof_addr in * H5F_file_t). * * If human_readable is TRUE, this field is undefined. * * length_width: If human_readable is FALSE, this field contains the - * width of lengths in the HDF5 file in bytes (as - * specified in the super block -- sizeof_size in + * width of lengths in the HDF5 file in bytes (as + * specified in the super block -- sizeof_size in * H5F_file_t). * * chksum_cur_msg: Boolean flag that is only defined if human_readable * is false. It is used to indicate whether the current - * journal message must be checksumed. If true, the + * journal message must be checksumed. If true, the * message checksum to date is stored in the msg_chksum * (discussed below). * - * If the journal message is being checksumed, this + * If the journal message is being checksumed, this * field will be set back to FALSE when the checksum * of the messages is written to buffer. * @@ -137,7 +137,7 @@ * journal file message. Note that not all messages * are checksumed -- this field is only defined when * chksum_cur_msg is TRUE. - * + * * journal_is_empty: Boolean flag that indicates if the journal file * associated with the ring buffer is currently * empty. @@ -155,7 +155,7 @@ * * hdf5_file_name: Character array containing the name of the HDF5 file * associated with this journal file. - * + * * header_present: Boolean flag that indicates if the header message has * been written into the current journal file or journal * buffer. @@ -165,14 +165,14 @@ * ring buffer needs to switch to writing to the next * journal buffer. * - * rb_space_to_rollover: The amount of space left at the end of the ring + * rb_space_to_rollover: The amount of space left at the end of the ring * buffer, starting at the head pointer, and ending at * the end of the ring buffer's allocate space. This * is used to keep track of when a rollover to the start * of the ring buffer must occur. * * rb_free_space: The amount of unused space in the ring buffer. - * + * * head: A pointer to the location in the active journal buffer * that is to be written to. * @@ -182,7 +182,7 @@ * is the last transaction successfully on disk. * * buf: Array of char pointers to each journal buffer in the - * ring buffer. This is allocated as a single chunk of + * ring buffer. This is allocated as a single chunk of * memory, and thus data can be written past a buffer * boundary provided it will not extend past the end * of the total area allocated for the ring buffer. @@ -201,7 +201,7 @@ #define H5C2_JNL__OFFSET_WIDTH_TAG "offset_width" #define H5C2_JNL__LENGTH_WIDTH_TAG "length_width" -/* signatures and versions used to mark the beginnings of journal file +/* signatures and versions used to mark the beginnings of journal file * messages in binary journal files. */ @@ -215,7 +215,7 @@ #define H5C2_BJNL__END_ADDR_SPACE_SIG "eoas" #define H5C2_BJNL__END_ADDR_SPACE_VER ((uint8_t)(0)) -struct H5C2_jbrb_t +struct H5C2_jbrb_t { uint32_t magic; int32_t journal_magic; @@ -249,12 +249,12 @@ struct H5C2_jbrb_t }; -/* With the introduction of the fractal heap, it is now possible for +/* With the introduction of the fractal heap, it is now possible for * entries to be dirtied, resized, and/or renamed in the flush callbacks. * As a result, on flushes, it may be necessary to make multiple passes * through the slist before it is empty. The H5C2__MAX_PASSES_ON_FLUSH * #define is used to set an upper limit on the number of passes. - * The current value was obtained via personal communication with + * The current value was obtained via personal communication with * Quincey. I have applied a fudge factor of 2. */ @@ -265,8 +265,8 @@ struct H5C2_jbrb_t * * structure H5C2_mdjsc_record_t * - * A dynamically allocate array of instances of H5C2_mdjsc_record_t is - * used to record metadata journaling status change callbacks -- of which + * A dynamically allocate array of instances of H5C2_mdjsc_record_t is + * used to record metadata journaling status change callbacks -- of which * there can be an arbitrary number. * * The fields in the structure are discussed individually below: @@ -275,20 +275,20 @@ struct H5C2_jbrb_t * to be called on metadata journaling start or stop. NULL * if this record is not in use. * - * Note that the cache must be clean when this callback + * Note that the cache must be clean when this callback * is called. * * data_ptr: Pointer to void. This value is supplied on registration, - * and is passed to *fcn_ptr. NULL if this record is not + * and is passed to *fcn_ptr. NULL if this record is not * in use. * * fl_next: Index of the next free entry in the metadata status change - * callback table, or -1 if there is no next free entry or + * callback table, or -1 if there is no next free entry or * if the entry is in use. * ****************************************************************************/ -typedef struct H5C2_mdjsc_record_t +typedef struct H5C2_mdjsc_record_t { H5C2_mdj_status_change_func_t fcn_ptr; void * data_ptr; @@ -334,11 +334,11 @@ typedef struct H5C2_mdjsc_record_t * * JRM - 9/26/05 * - * magic: Unsigned 32 bit integer always set to H5C2__H5C2_T_MAGIC. - * This field is used to validate pointers to instances of + * magic: Unsigned 32 bit integer always set to H5C2__H5C2_T_MAGIC. + * This field is used to validate pointers to instances of * H5C2_t. * - * flush_in_progress: Boolean flag indicating whether a flush is in + * flush_in_progress: Boolean flag indicating whether a flush is in * progress. * * trace_file_ptr: File pointer pointing to the trace file, which is used @@ -347,7 +347,7 @@ typedef struct H5C2_mdjsc_record_t * no trace file should be recorded. * * Since much of the code supporting the parallel metadata - * cache is in H5AC, we don't write the trace file from + * cache is in H5AC, we don't write the trace file from * H5C2. Instead, H5AC reads the trace_file_ptr as needed. * * When we get to using H5C2 in other places, we may add @@ -420,10 +420,10 @@ typedef struct H5C2_mdjsc_record_t * writes. The following field is used to implement this. * * evictions_enabled: Boolean flag that is initialized to TRUE. When - * this flag is set to FALSE, the metadata cache will not + * this flag is set to FALSE, the metadata cache will not * attempt to evict entries to make space for newly protected * entries, and instead the will grow without limit. - * + * * Needless to say, this feature must be used with care. * * @@ -494,7 +494,7 @@ typedef struct H5C2_mdjsc_record_t * following two fields have been added. They are only compiled in when * H5C2_DO_SANITY_CHECKS is TRUE. * - * slist_len_increase: Number of entries that have been added to the + * slist_len_increase: Number of entries that have been added to the * slist since the last time this field was set to zero. * * slist_size_increase: Total size of all entries that have been added @@ -817,39 +817,39 @@ typedef struct H5C2_mdjsc_record_t * * Metadata journaling fields: * - * The following fields are used to support metadata journaling. The + * The following fields are used to support metadata journaling. The * objective here is to journal all changes in metadata, so that we will * be able to re-construct a HDF5 file with a consistent set of metadata * in the event of a crash. * - * mdj_enabled: Boolean flag used to indicate whether journaling is - * currently enabled. In general, the values of the - * remaining fields in this section are undefined if + * mdj_enabled: Boolean flag used to indicate whether journaling is + * currently enabled. In general, the values of the + * remaining fields in this section are undefined if * mdj_enabled is FALSE. * * trans_in_progress Boolean flag used to indicate whether a metadata - * transaction is in progress. + * transaction is in progress. * - * For purposes of metadata journaling, a transaction is a - * sequence of operations on metadata selected such that - * the HDF5 file metadata is in a consistent state both at - * the beginning and at the end of the sequence. + * For purposes of metadata journaling, a transaction is a + * sequence of operations on metadata selected such that + * the HDF5 file metadata is in a consistent state both at + * the beginning and at the end of the sequence. * * At least to begin with, transactions will be closely tied * to user level API calls. * - * trans_api_name: Array of char of length H5C2__MAX_API_NAME_LEN + 1. Used - * to store the name of the API call associated with the + * trans_api_name: Array of char of length H5C2__MAX_API_NAME_LEN + 1. Used + * to store the name of the API call associated with the * current transaction. * - * trans_num: uint64_t containing the id assigned to the current - * transaction (if trans_in_progress is TRUE), or of the + * trans_num: uint64_t containing the id assigned to the current + * transaction (if trans_in_progress is TRUE), or of the * last transaction completed (if trans_in_progress is FALSE), * or zero if no transaction has been initiated yet. * - * last_trans_on_disk: uint64_t containing the id assigned to the + * last_trans_on_disk: uint64_t containing the id assigned to the * last transaction all of whose associated journal entries - * are on disk in the journal file. + * are on disk in the journal file. * * We must track this value, as to avoid messages from the * future, we must not write a cache entry to file until @@ -858,21 +858,21 @@ typedef struct H5C2_mdjsc_record_t * file. * * jnl_magic: Randomly selected int32_t used to reduce the possibility - * of running the wrong journal on an HDF5 file. The basic - * idea is to pick a random number, store it in both the HDF5 - * file and the journal file, and then refuse to run the + * of running the wrong journal on an HDF5 file. The basic + * idea is to pick a random number, store it in both the HDF5 + * file and the journal file, and then refuse to run the * journal unless the numbers match. * * jnl_file_name_len: Length of the journal file name, or zero if the * journal file name is undefined. * - * jnl_file_name: Array of char of length H5C2__MAX_JOURNAL_FILE_NAME_LEN + * jnl_file_name: Array of char of length H5C2__MAX_JOURNAL_FILE_NAME_LEN * + 1 used to store the journal file path. * * mdj_jbrb: Instance of H5C2_jbrb_t used to manage logging of journal * entries to the journal file. * - * While a transaction is in progress, we must maintain a list of the + * While a transaction is in progress, we must maintain a list of the * entries that have been modified during the transaction so we can * generate the appropriate journal entries. The following fields are * used to maintain this list: @@ -883,56 +883,56 @@ typedef struct H5C2_mdjsc_record_t * transaction list. * * tl_head_ptr: Pointer to the head of the doubly linked list of entries - * dirtied in the current transaction. Note that cache entries - * on this list are linked by their trans_next and trans_prev + * dirtied in the current transaction. Note that cache entries + * on this list are linked by their trans_next and trans_prev * fields. * * This field is NULL if the list is empty. * * tl_tail_ptr: Pointer to the tail of the doubly linked list of entries - * dirtied in the current transaction. Note that cache entries - * on this list are linked by their trans_next and trans_prev + * dirtied in the current transaction. Note that cache entries + * on this list are linked by their trans_next and trans_prev * fields. * * This field is NULL if the list is empty. * - * When an entry is dirtied in a transaction, we must not flush it until - * all the journal entries generated by the transaction have reached disk + * When an entry is dirtied in a transaction, we must not flush it until + * all the journal entries generated by the transaction have reached disk * in the journal file. * * We could just leave these entries in the LRU and skip over them when - * we scan the list for candidates for eviction. However, this will be + * we scan the list for candidates for eviction. However, this will be * costly, so we store them on the journal write in progress list instead - * until all the journal entries for the specified transaction reaches + * until all the journal entries for the specified transaction reaches * disk. * - * jwipl_len: Number of entries currently residing on the journal + * jwipl_len: Number of entries currently residing on the journal * entry write in progress list. * * jwipl_size: Number of bytes of cache entries currently residing on the * journal entry write in progress list. * * jwipl_head_ptr: Pointer to the head of the doubly linked list of entries - * dirtied in some transaction n, where at least some of the + * dirtied in some transaction n, where at least some of the * journal entries generated in transaction n have not yet * made it to disk in the journal file. * - * Entries on this list are linked by their next and prev + * Entries on this list are linked by their next and prev * fields. * * This field is NULL if the list is empty. * * jwipl_tail_ptr: Pointer to the tail of the doubly linked list of entries - * dirtied in some transaction n, where at least some of the + * dirtied in some transaction n, where at least some of the * journal entries generated in transaction n have not yet * made it to disk in the journal file. * - * Entries on this list are linked by their next and prev + * Entries on this list are linked by their next and prev * fields. * * This field is NULL if the list is empty. * - * It is necessary to turn off some optimization while journaling is + * It is necessary to turn off some optimization while journaling is * in progress, so as to avoid generating dirty metadata during a flush. * The following fields are used to maintain a list of functions to be * called when journaling is enabled or disabled. Note that the metadata @@ -940,15 +940,15 @@ typedef struct H5C2_mdjsc_record_t * * The metadata journaling status change callback table is initaly allocated * with H5C2__MIN_MDJSC_CB_TBL_LEN entries. The table size is doubled - * whenever an entry is added to a full table, and halved whenever the - * active entries to total entries ratio drops below - * H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is - * empty (Since entries are removed from the table by specifying the + * whenever an entry is added to a full table, and halved whenever the + * active entries to total entries ratio drops below + * H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is + * empty (Since entries are removed from the table by specifying the * index of the entry, we can't compress the table). * * mdjsc_cb_tbl: Base address of a dynamically allocated array of instances - * of H5C2_mdjsc_record_t used to record an arbitrarily long - * list of functions to call whenever journaling is enabled or + * of H5C2_mdjsc_record_t used to record an arbitrarily long + * list of functions to call whenever journaling is enabled or * disabled. * * mdjsc_cb_tbl_len: Number of entries currently allocated in *mdjsc_cb_tbl. @@ -960,7 +960,7 @@ typedef struct H5C2_mdjsc_record_t * or -1 if the table is full. * * mdjsc_cb_tbl_max_idx_in_use: Maximum of the indicies of metadata journaling - * status change callback table entries in use, or -1 if the + * status change callback table entries in use, or -1 if the * table is empty; * * Statistics collection fields: @@ -979,23 +979,23 @@ typedef struct H5C2_mdjsc_record_t * equal to the array index has not been in cache when * requested in the current epoch. * - * write_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The - * cells are used to record the number of times an entry with - * type id equal to the array index has been write protected + * write_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The + * cells are used to record the number of times an entry with + * type id equal to the array index has been write protected * in the current epoch. * * Observe that (hits + misses) = (write_protects + read_protects). * - * read_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The - * cells are used to record the number of times an entry with - * type id equal to the array index has been read protected in + * read_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The + * cells are used to record the number of times an entry with + * type id equal to the array index has been read protected in * the current epoch. * * Observe that (hits + misses) = (write_protects + read_protects). * - * max_read_protects: Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1. - * The cells are used to maximum number of simultaneous read - * protects on any entry with type id equal to the array index + * max_read_protects: Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1. + * The cells are used to maximum number of simultaneous read + * protects on any entry with type id equal to the array index * in the current epoch. * * insertions: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The cells @@ -1003,9 +1003,9 @@ typedef struct H5C2_mdjsc_record_t * id equal to the array index has been inserted into the * cache in the current epoch. * - * pinned_insertions: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry - * with type id equal to the array index has been inserted + * pinned_insertions: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry + * with type id equal to the array index has been inserted * pinned into the cache in the current epoch. * * clears: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. The cells @@ -1028,13 +1028,13 @@ typedef struct H5C2_mdjsc_record_t * id equal to the array index has been renamed in the current * epoch. * - * entry_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry + * entry_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry * with type id equal to the array index has been renamed * during its flush callback in the current epoch. * - * cache_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry + * cache_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry * with type id equal to the array index has been renamed * during a cache flush in the current epoch. * @@ -1073,14 +1073,14 @@ typedef struct H5C2_mdjsc_record_t * with type id equal to the array index has decreased in * size in the current epoch. * - * entry_flush_size_changes: Array of int64 of length - * H5C2__MAX_NUM_TYPE_IDS + 1. The cells are used to record - * the number of times an entry with type id equal to the + * entry_flush_size_changes: Array of int64 of length + * H5C2__MAX_NUM_TYPE_IDS + 1. The cells are used to record + * the number of times an entry with type id equal to the * array index has changed size while in its flush callback. * - * cache_flush_size_changes: Array of int64 of length - * H5C2__MAX_NUM_TYPE_IDS + 1. The cells are used to record - * the number of times an entry with type id equal to the + * cache_flush_size_changes: Array of int64 of length + * H5C2__MAX_NUM_TYPE_IDS + 1. The cells are used to record + * the number of times an entry with type id equal to the * array index has changed size during a cache flush * * total_ht_insertions: Number of times entries have been inserted into the @@ -1278,7 +1278,7 @@ struct H5C2_t int64_t cache_hits; int64_t cache_accesses; - + hbool_t mdj_enabled; hbool_t trans_in_progress; char trans_api_name[H5C2__MAX_API_NAME_LEN]; @@ -1286,7 +1286,7 @@ struct H5C2_t uint64_t last_trans_on_disk; int32_t jnl_magic; int32_t jnl_file_name_len; - char jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN + char jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1]; struct H5C2_jbrb_t mdj_jbrb; int32_t tl_len; @@ -1302,7 +1302,7 @@ struct H5C2_t int32_t num_mdjsc_cbs; int32_t mdjsc_cb_tbl_fl_head; int32_t mdjsc_cb_tbl_max_idx_in_use; - + #if H5C2_COLLECT_CACHE_STATS /* stats fields */ @@ -1468,10 +1468,10 @@ struct H5C2_t * * JRM - 9/8/05 * - * - Added a set of macros supporting doubly linked lists using the new - * trans_next and trans_prev fields in H5C2_cache_entry_t. These + * - Added a set of macros supporting doubly linked lists using the new + * trans_next and trans_prev fields in H5C2_cache_entry_t. These * fields are used to maintain a list of entries that have been dirtied - * in the current transaction. At the end of the transaction, this + * in the current transaction. At the end of the transaction, this * list is used to generate the needed journal entries. * * JRM -- 3/27/08 @@ -1974,7 +1974,7 @@ if ( ( (entry_ptr) == NULL ) || \ * More pinned entry stats related updates. * * JRM -- 3/31/07 - * Updated H5C2__UPDATE_STATS_FOR_PROTECT() to keep stats on + * Updated H5C2__UPDATE_STATS_FOR_PROTECT() to keep stats on * read and write protects. * ***********************************************************************/ @@ -2553,12 +2553,12 @@ if ( ( (cache_ptr) == NULL ) || \ * JRM -- 8/25/06 * Added the H5C2_DO_SANITY_CHECKS version of the macro. * - * This version maintains the slist_len_increase and + * This version maintains the slist_len_increase and * slist_size_increase fields that are used in sanity * checks in the flush routines. * - * All this is needed as the fractal heap needs to be - * able to dirty, resize and/or rename entries during the + * All this is needed as the fractal heap needs to be + * able to dirty, resize and/or rename entries during the * flush. * *------------------------------------------------------------------------- @@ -2645,7 +2645,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Switched over to using skip list routines. * * JRM -- 3/28/07 - * Updated sanity checks for the new is_read_only and + * Updated sanity checks for the new is_read_only and * ro_ref_count fields in H5C2_cache_entry_t. * *------------------------------------------------------------------------- @@ -2693,11 +2693,11 @@ if ( ( (cache_ptr) == NULL ) || \ * JRM -- 8/27/06 * Added the H5C2_DO_SANITY_CHECKS version of the macro. * - * This version maintains the slist_size_increase field + * This version maintains the slist_size_increase field * that are used in sanity checks in the flush routines. * - * All this is needed as the fractal heap needs to be - * able to dirty, resize and/or rename entries during the + * All this is needed as the fractal heap needs to be + * able to dirty, resize and/or rename entries during the * flush. * *------------------------------------------------------------------------- @@ -2788,7 +2788,7 @@ if ( ( (cache_ptr) == NULL ) || \ * to do if called for such an entry. * * JRM -- 3/28/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM -- 3/29/08 @@ -2936,7 +2936,7 @@ if ( ( (cache_ptr) == NULL ) || \ * be called on a pinned entry. Added assert to verify this. * * JRM -- 3/28/07 - * Added sanity checks for the new is_read_only and + * Added sanity checks for the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM -- 3/29/08 @@ -3203,7 +3203,7 @@ if ( ( (cache_ptr) == NULL ) || \ * Inserted an assert to verify this. * * JRM - 8/9/06 - * Not any more. We must now allow insertion of pinned + * Not any more. We must now allow insertion of pinned * entries. Updated macro to support this. * * JRM - 3/28/07 @@ -3211,13 +3211,13 @@ if ( ( (cache_ptr) == NULL ) || \ * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM - 3/29/30 - * Added sanity check that verifies that the last_trans field - * of the entry matches the trans_num field of the cache. - * Note that when journaling is disabled, both of these - * fields should contain zero. Also verify that either + * Added sanity check that verifies that the last_trans field + * of the entry matches the trans_num field of the cache. + * Note that when journaling is disabled, both of these + * fields should contain zero. Also verify that either * journaling is disabled or a transaction is in progress. * - * Added code to put the entry in the journal write in + * Added code to put the entry in the journal write in * progress list if entries last_trans field is non- * zero and the entry is not pinned. * @@ -3341,13 +3341,13 @@ if ( ( (cache_ptr) == NULL ) || \ * * Macro: H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE * - * Purpose: Update the replacement policy data structures for the - * completion of the last pending journal write for the + * Purpose: Update the replacement policy data structures for the + * completion of the last pending journal write for the * specified un-pinned and un-protected cache entry. * * If an entry with a pending journal write is not protected - * and is not pinned, it must be on the journal write in - * progress list. Unlink it from that list, and add it to + * and is not pinned, it must be on the journal write in + * progress list. Unlink it from that list, and add it to * the data structures used by the current replacement policy. * * At present, we only support the modified LRU policy, so @@ -3470,8 +3470,8 @@ if ( ( (cache_ptr) == NULL ) || \ * load from disk of the specified cache entry. * * Note that we update the replacement policy for load only - * as a convenience -- the newly loaded entry will be - * protected immediately. If this starts to eat up a + * as a convenience -- the newly loaded entry will be + * protected immediately. If this starts to eat up a * significant number of cycles, we will have to re-work * the code to avoid this step. * @@ -3608,7 +3608,7 @@ if ( ( (cache_ptr) == NULL ) || \ * maintained by the replacement policy. * * JRM - 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM - 3/29/08 @@ -3798,14 +3798,14 @@ if ( ( (cache_ptr) == NULL ) || \ * nothing to be done. * * JRM - 3/28/07 - * Added sanity checks using the new is_read_only and + * Added sanity checks using the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM - 3/29/08 * Reworked macro to handle the case in which the renamed * entry has a journal write pending -- this required the - * addition of the had_jwip parameter. Also added some - * related sanity checks. + * addition of the had_jwip parameter. Also added some + * related sanity checks. * *------------------------------------------------------------------------- */ @@ -4017,7 +4017,7 @@ if ( ( (cache_ptr) == NULL ) || \ * To do this, determine if the entry is pinned. If it is, * update the size of the pinned entry list. * - * If it isn't pinned, the entry must handled by the + * If it isn't pinned, the entry must handled by the * replacement policy. Update the appropriate replacement * policy data structures. * @@ -4033,13 +4033,13 @@ if ( ( (cache_ptr) == NULL ) || \ * Modifications: * * JRM -- 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM -- 3/29/08 * Added code to deal with the journal write in progress * list -- in essence, after checking to see if the entry is - * pinned, check to see if it is on the jwip list. If it + * pinned, check to see if it is on the jwip list. If it * is, update the size of that list. If not, proceed as * before. * @@ -4182,11 +4182,11 @@ if ( ( (cache_ptr) == NULL ) || \ * Modifications: * * JRM -- 3/28/07 - * Added sanity checks based on the new is_read_only and + * Added sanity checks based on the new is_read_only and * ro_ref_count fields of struct H5C2_cache_entry_t. * * JRM -- 3/30/08 - * Added code to place the newly unpinned entry on the + * Added code to place the newly unpinned entry on the * journal write pending list if appropriate. * *------------------------------------------------------------------------- @@ -4354,7 +4354,7 @@ if ( ( (cache_ptr) == NULL ) || \ * maintained by the replacement policy. * * JRM - 3/30/08 - * Modified macro to put un-pinned entries with pending + * Modified macro to put un-pinned entries with pending * journal writes on the journal write in progress list. * *------------------------------------------------------------------------- @@ -4538,7 +4538,7 @@ if ( cache_ptr->mdj_enabled ) \ * Purpose: Check to see if journaling is enabled. * * If it is, see if the target entry is in the transaction - * list. If it is, remove it from the list, and set its + * list. If it is, remove it from the list, and set its * last_trans field to zero. * * Return: N/A @@ -4621,9 +4621,9 @@ if ( cache_ptr->mdj_enabled ) \ * * Macro: H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE * - * Purpose: Update the transaction list for a change in the size of + * Purpose: Update the transaction list for a change in the size of * one of its constituents. Note that it is the callers - * responsibility to verify that the entry is in the + * responsibility to verify that the entry is in the * transaction list if it should be. * * Return: N/A diff --git a/src/H5C2private.h b/src/H5C2private.h index f7aec7e..0d053b0 100644 --- a/src/H5C2private.h +++ b/src/H5C2private.h @@ -107,13 +107,13 @@ typedef struct H5C2_t H5C2_t; * name: Pointer to a string containing the name of the class of metadata * cache entries. * - * mem_type: Instance of H5FD_mem_t, that is used to supply the + * mem_type: Instance of H5FD_mem_t, that is used to supply the * mem type passed into H5F_block_read(). * * deserialize: Pointer to the deserialize function. * * This function must be able to read an on disk image of a metadata - * cache entry, allocate and load the equivalent in core representation, + * cache entry, allocate and load the equivalent in core representation, * and return a pointer to that representation. * * The typedef for the deserialize callback is as follows: @@ -140,8 +140,8 @@ typedef struct H5C2_t H5C2_t; * mode, but the parameter may be unused when compiled in * production mode. * - * image_ptr: Pointer to a buffer of length len containing the - * contents of the file starting at addr and continuing + * image_ptr: Pointer to a buffer of length len containing the + * contents of the file starting at addr and continuing * for len bytes. * * udata_ptr: Pointer to user data provided in the protect call, which @@ -155,22 +155,22 @@ typedef struct H5C2_t H5C2_t; * Processing in the deserialize function should proceed as follows: * * If the image contains valid data, and is of the correct length, - * the deserialize function must allocate space for an in core - * representation of that data, load the contents of the image into - * the space allocated for the in core representation, and return - * a pointer to the in core representation. Observe that an - * instance of H5C2_cache_entry_t must be the first item in this - * representation. It will have to be initialized appropriately + * the deserialize function must allocate space for an in core + * representation of that data, load the contents of the image into + * the space allocated for the in core representation, and return + * a pointer to the in core representation. Observe that an + * instance of H5C2_cache_entry_t must be the first item in this + * representation. It will have to be initialized appropriately * after the callback returns. * * Note that the structure of the in core representation is otherwise - * up to the cache client. All that is required is that the pointer - * returned be sufficient for the clients purposes when it is returned + * up to the cache client. All that is required is that the pointer + * returned be sufficient for the clients purposes when it is returned * on a protect call. * * If the deserialize function has to clean up file corruption * left over from an old bug in the HDF5 library, it must set - * *dirty_ptr to TRUE. If it doesn't, no action is needed as + * *dirty_ptr to TRUE. If it doesn't, no action is needed as * *dirty_ptr will be set to FALSE before the deserialize call. * * If the operation fails for any reason (i.e. bad data in buffer, bad @@ -214,18 +214,18 @@ typedef struct H5C2_t H5C2_t; * serialize: Pointer to the serialize callback. * * The serialize callback is invoked by the metadata cache whenever - * it needs a current on disk image of the metadata entry for purposes + * it needs a current on disk image of the metadata entry for purposes * either constructing a journal or flushing the entry to disk. * - * At this point, one would think that the base address and length of - * the length of the entry's image on disk would be well known. - * However, that need not be the case as fractal heap blocks can - * change size (and therefor possible location as well) on - * serialization if compression is enabled. In the old H5C code, - * this happened on a flush, and occasioned a rename in the midst - * of the flush. To avoid this in H5C2, the serialize callback - * will return the new base address, length, and image pointer to - * the caller when necessary. The caller must then update the + * At this point, one would think that the base address and length of + * the length of the entry's image on disk would be well known. + * However, that need not be the case as fractal heap blocks can + * change size (and therefor possible location as well) on + * serialization if compression is enabled. In the old H5C code, + * this happened on a flush, and occasioned a rename in the midst + * of the flush. To avoid this in H5C2, the serialize callback + * will return the new base address, length, and image pointer to + * the caller when necessary. The caller must then update the * metadata cache's internal structures accordingly. * * The typedef for the serialize callback is as follows: @@ -237,19 +237,19 @@ typedef struct H5C2_t H5C2_t; * void * image_ptr, * void * thing, * unsigned * flags_ptr, - * haddr_t * new_addr_ptr, - * size_t * new_len_ptr, + * haddr_t * new_addr_ptr, + * size_t * new_len_ptr, * void ** new_image_ptr_ptr); * * The parameters of the serialize callback are as follows: * * f: File pointer -- needed if other metadata cache entries - * must be modified in the process of serializing the + * must be modified in the process of serializing the * target entry. * - * dxpl_id: dxpl_id passed with the file pointer to the cache, and - * passed on to the callback. Necessary as some callbacks - * revise the size and location of the target entry, or + * dxpl_id: dxpl_id passed with the file pointer to the cache, and + * passed on to the callback. Necessary as some callbacks + * revise the size and location of the target entry, or * possibly other entries on serialize. * * addr: Base address in file of the entry to be serialized. @@ -267,157 +267,157 @@ typedef struct H5C2_t H5C2_t; * mode, but the parameter may be unused when compiled in * production mode. * - * image_ptr: Pointer to a buffer of length len bytes into which a - * serialized image of the target metadata cache entry is + * image_ptr: Pointer to a buffer of length len bytes into which a + * serialized image of the target metadata cache entry is * to be written. * - * Note that this buffer will not in general be initialized - * to any particular value. Thus the serialize function may - * not assume any initial value and must set each byte in + * Note that this buffer will not in general be initialized + * to any particular value. Thus the serialize function may + * not assume any initial value and must set each byte in * the buffer. * - * thing: Pointer to void containing the address of the in core - * representation of the target metadata cache entry. - * This is the same pointer returned by a protect of the + * thing: Pointer to void containing the address of the in core + * representation of the target metadata cache entry. + * This is the same pointer returned by a protect of the * addr and len given above. * - * flags_ptr: Pointer to an unsigned integer used to return flags - * indicating whether the resize function resized or renamed - * the entry. If the entry was neither resized or renamed, - * the serialize function must set *flags_ptr to zero. - * H5C2__SERIALIZE_RESIZED_FLAG and H5C2__SERIALIZE_RENAMED_FLAG + * flags_ptr: Pointer to an unsigned integer used to return flags + * indicating whether the resize function resized or renamed + * the entry. If the entry was neither resized or renamed, + * the serialize function must set *flags_ptr to zero. + * H5C2__SERIALIZE_RESIZED_FLAG and H5C2__SERIALIZE_RENAMED_FLAG * must be set to indicate a resize and a rename respectively. * - * If the H5C2__SERIALIZE_RESIZED_FLAG is set, the new length - * and image pointer must be stored in *new_len_ptr and - * *new_image_ptr_ptr respectively. - * - * If the H5C2__SERIALIZE_RENAMED_FLAG flag is also set, the - * new image base address must be stored in *new_addr_ptr. - * Observe that the H5C2__SERIALIZE_RENAMED_FLAG must not - * appear without the H5C2__SERIALIZE_RESIZED_FLAG. - * - * Except as noted above, the locations pointed to by the - * remaining parameters are undefined, and should be ignored - * by the caller. - * - * new_addr_ptr: Pointer to haddr_t. If the entry is renamed by - * the serialize function, the new on disk base address must - * be stored in *new_addr_ptr. If the entry is not renamed - * by the serialize function, *new_addr_ptr is undefined. - * - * new_len_ptr: Pointer to size_t. If the entry is resized by the - * serialize function, the new length of the on disk image - * must be stored in *new_len_ptr. If the entry is not - * resized by the serialize function, *new_len_ptr is - * undefined. - * - * new_image_ptr_ptr: Pointer to pointer to void. If the entry is - * resized by the serialize function, the pointer to the - * new buffer containing the on disk image must be stored - * in *new_image_ptr_ptr. If the entry is not resized by + * If the H5C2__SERIALIZE_RESIZED_FLAG is set, the new length + * and image pointer must be stored in *new_len_ptr and + * *new_image_ptr_ptr respectively. + * + * If the H5C2__SERIALIZE_RENAMED_FLAG flag is also set, the + * new image base address must be stored in *new_addr_ptr. + * Observe that the H5C2__SERIALIZE_RENAMED_FLAG must not + * appear without the H5C2__SERIALIZE_RESIZED_FLAG. + * + * Except as noted above, the locations pointed to by the + * remaining parameters are undefined, and should be ignored + * by the caller. + * + * new_addr_ptr: Pointer to haddr_t. If the entry is renamed by + * the serialize function, the new on disk base address must + * be stored in *new_addr_ptr. If the entry is not renamed + * by the serialize function, *new_addr_ptr is undefined. + * + * new_len_ptr: Pointer to size_t. If the entry is resized by the + * serialize function, the new length of the on disk image + * must be stored in *new_len_ptr. If the entry is not + * resized by the serialize function, *new_len_ptr is + * undefined. + * + * new_image_ptr_ptr: Pointer to pointer to void. If the entry is + * resized by the serialize function, the pointer to the + * new buffer containing the on disk image must be stored + * in *new_image_ptr_ptr. If the entry is not resized by * the serialize function, *new_image_ptr_ptr is undefined. * - * Processing in the serialize function should proceed as follows: + * Processing in the serialize function should proceed as follows: * - * The serialize function must examine the in core representation - * indicated by the thing parameter, and write a serialized image - * of its contents into the provided buffer. + * The serialize function must examine the in core representation + * indicated by the thing parameter, and write a serialized image + * of its contents into the provided buffer. * - * If the serialize function does not change the size or location - * of the on disk image, it must set *flags_ptr to zero. + * If the serialize function does not change the size or location + * of the on disk image, it must set *flags_ptr to zero. * - * If the size of the on disk image must be changed, the serialize - * function must free the old image buffer (base address in image_ptr), - * allocate a new one, load the image into the new buffer, load the - * base address of the new buffer into *new_image_ptr_ptr, load the - * length of the new image into *new_len_ptr, and set the - * H5C2__SERIALIZE_RESIZED_FLAG in *flags_ptr. + * If the size of the on disk image must be changed, the serialize + * function must free the old image buffer (base address in image_ptr), + * allocate a new one, load the image into the new buffer, load the + * base address of the new buffer into *new_image_ptr_ptr, load the + * length of the new image into *new_len_ptr, and set the + * H5C2__SERIALIZE_RESIZED_FLAG in *flags_ptr. * - * If in addition, the base address of the on disk image must - * be changed, the serialize function must also set *new_addr_ptr - * to the new base address, and set the H5C2__SERIALIZE_RENAMED_FLAG + * If in addition, the base address of the on disk image must + * be changed, the serialize function must also set *new_addr_ptr + * to the new base address, and set the H5C2__SERIALIZE_RENAMED_FLAG * in *flags_ptr. * - * If it is successful, the function must return SUCCEED. + * If it is successful, the function must return SUCCEED. * * If it fails for any reason, the function must return FAIL and - * push error information on the error stack with the error API + * push error information on the error stack with the error API * routines. * * * free_icr: Pointer to the free ICR Callback. * - * The free ICR callback is invoked by the metadata cache when it - * wishes to evict an entry, and needs the client to free the memory - * allocated for the in core representation. + * The free ICR callback is invoked by the metadata cache when it + * wishes to evict an entry, and needs the client to free the memory + * allocated for the in core representation. * - * The typedef for the free ICR callback is as follows: + * The typedef for the free ICR callback is as follows: * - * typedef herr_t (*N5C_free_icr_func_t)(haddr_t addr, + * typedef herr_t (*N5C_free_icr_func_t)(haddr_t addr, * size_t len, * void * thing); - * - * The parameters of the free ICR callback are as follows: * - * addr: Base address in file of the entry being evicted. + * The parameters of the free ICR callback are as follows: * - * This parameter is supplied mainly for sanity checking. - * Sanity checks should be performed when compiled in debug - * mode, but the parameter may be unused when compiled in - * production mode. + * addr: Base address in file of the entry being evicted. * - * len: Length of the in file image of the entry being evicted - * in bytes. + * This parameter is supplied mainly for sanity checking. + * Sanity checks should be performed when compiled in debug + * mode, but the parameter may be unused when compiled in + * production mode. * - * This parameter is supplied mainly for sanity checking. - * Sanity checks should be performed when compiled in debug - * mode, but the parameter may be unused when compiled in - * production mode. + * len: Length of the in file image of the entry being evicted + * in bytes. * - * thing: Pointer to void containing the address of the in core - * representation of the target metadata cache entry. This - * is the same pointer that would be returned by a protect - * of the addr and len above. + * This parameter is supplied mainly for sanity checking. + * Sanity checks should be performed when compiled in debug + * mode, but the parameter may be unused when compiled in + * production mode. * - * Processing in the free ICR function should proceed as follows: + * thing: Pointer to void containing the address of the in core + * representation of the target metadata cache entry. This + * is the same pointer that would be returned by a protect + * of the addr and len above. * - * The free ICR function must free all memory allocated to the - * in core representation. + * Processing in the free ICR function should proceed as follows: * - * If the function is successful, it must return SUCCEED. + * The free ICR function must free all memory allocated to the + * in core representation. * - * If it fails for any reason, the function must return FAIL and - * push error information on the error stack with the error API - * routines. + * If the function is successful, it must return SUCCEED. * - * At least when compiled with debug, it would be useful if the - * free ICR call would fail if the in core representation has been + * If it fails for any reason, the function must return FAIL and + * push error information on the error stack with the error API + * routines. + * + * At least when compiled with debug, it would be useful if the + * free ICR call would fail if the in core representation has been * modified since the last serialize of clear callback. * * * clear_dirty_bits: Pointer to the clear dirty bits callback. * - * For sanity checking purposes, it will be useful if cache clients - * track whether an in core representation has been modified since - * the last time it was serialized. This data is used to flag an - * error if the cache attempts to free an in core representation - * that has not been serialized since the last time it was modified. + * For sanity checking purposes, it will be useful if cache clients + * track whether an in core representation has been modified since + * the last time it was serialized. This data is used to flag an + * error if the cache attempts to free an in core representation + * that has not been serialized since the last time it was modified. * - * If this happens, either the client forgot to tell the cache that - * an entry is dirty, or the cache forgot to flush a dirty entry - * before evicting it. In either case we want to know before we - * get file corruption complaints. + * If this happens, either the client forgot to tell the cache that + * an entry is dirty, or the cache forgot to flush a dirty entry + * before evicting it. In either case we want to know before we + * get file corruption complaints. * - * However, in some cases, we want to mark an entry as clean even - * though it has not been flushed to disk -- most particularly in - * the parallel case. Thus we need some way to tell the client - * that a free of the associated ICR is OK even though it has - * been modified since the last serialization. Hence the clear - * dirty bits callback. + * However, in some cases, we want to mark an entry as clean even + * though it has not been flushed to disk -- most particularly in + * the parallel case. Thus we need some way to tell the client + * that a free of the associated ICR is OK even though it has + * been modified since the last serialization. Hence the clear + * dirty bits callback. * - * Since the clear dirty bits callback is purely for sanity checking, - * it is called only when we compile with debug. + * Since the clear dirty bits callback is purely for sanity checking, + * it is called only when we compile with debug. * * The typedef for the clear callback is as follows: * @@ -425,27 +425,27 @@ typedef struct H5C2_t H5C2_t; * size_t len, * void * thing); * - * The parameters of the clear callback are as follows: + * The parameters of the clear callback are as follows: * - * addr: Base address in file of the entry whose dirty bits - * are being cleared + * addr: Base address in file of the entry whose dirty bits + * are being cleared * - * len: Length in bytes of the in file image of the entry - * whose dirty bits are being cleared. + * len: Length in bytes of the in file image of the entry + * whose dirty bits are being cleared. * - * thing: Pointer to void containing the address of the in - * core representation of the target metadata cache entry. - * This is the same pointer that would be returned by a - * protect of the addr and len above. + * thing: Pointer to void containing the address of the in + * core representation of the target metadata cache entry. + * This is the same pointer that would be returned by a + * protect of the addr and len above. * - * Processing in the clear callback function should proceed as follows: + * Processing in the clear callback function should proceed as follows: * - * The function must clear any dirty bits associated with the ICR. + * The function must clear any dirty bits associated with the ICR. * - * If successful, the function must return SUCCEED. + * If successful, the function must return SUCCEED. * - * If it fails for any reason, the function must return FAIL and - * push error information on the error stack with the error API + * If it fails for any reason, the function must return FAIL and + * push error information on the error stack with the error API * routines. * ***************************************************************************/ @@ -454,7 +454,7 @@ typedef void *(*H5C2_deserialize_func_t)(haddr_t addr, const void * image_ptr, void * udata_ptr, hbool_t * dirty_ptr); - + typedef herr_t (*H5C2_image_len_func_t)(const void *thing, size_t *image_len_ptr); @@ -467,12 +467,12 @@ typedef herr_t (*H5C2_serialize_func_t)(const H5F_t *f, size_t len, void * image_ptr, void * thing, - unsigned * flags_ptr, - haddr_t * new_addr_ptr, - size_t * new_len_ptr, + unsigned * flags_ptr, + haddr_t * new_addr_ptr, + size_t * new_len_ptr, void ** new_image_ptr_ptr); -typedef herr_t (*H5C2_free_icr_func_t)(haddr_t addr, +typedef herr_t (*H5C2_free_icr_func_t)(haddr_t addr, size_t len, void * thing); @@ -543,23 +543,23 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr, * * JRM - 4/26/04 * - * magic: Unsigned 32 bit integer that must always be set to + * magic: Unsigned 32 bit integer that must always be set to * H5C2__H5C2_CACHE_ENTRY_T_MAGIC when the entry is valid. * The field must be set to H5C2__H5C2_CACHE_ENTRY_T_BAD_MAGIC * just before the entry is freed. * - * This is necessary, as the LRU list can be changed out + * This is necessary, as the LRU list can be changed out * from under H5C2_make_space_in_cache() by the serialize * callback which may change the size of an existing entry, * and/or load a new entry while serializing the target entry. * - * This in turn can cause a recursive call to + * This in turn can cause a recursive call to * H5C2_make_space_in_cache() which may either flush or evict * the next entry that the first invocation of that function * was about to examine. * * The magic field allows H5C2_make_space_in_cache() to - * detect this case, and re-start its scan from the bottom + * detect this case, and re-start its scan from the bottom * of the LRU when this situation occurs. * * cache_ptr: Pointer to the cache that this entry is contained within. @@ -580,8 +580,8 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr, * block of memory on disk. The image of this block (i.e. * the on disk image) is stored in *image_ptr (discussed below). * - * image_ptr: Pointer to void. When not NULL, this field points to a - * dynamically allocated block of size bytes in which the + * image_ptr: Pointer to void. When not NULL, this field points to a + * dynamically allocated block of size bytes in which the * on disk image of the metadata cache entry is stored. * * If the entry is dirty, the serialize callback must be used @@ -645,20 +645,20 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr, * Note that protected entries are removed from the LRU lists * and inserted on the protected list. * - * is_read_only: Boolean flag that is only meaningful if is_protected is - * TRUE. In this circumstance, it indicates whether the + * is_read_only: Boolean flag that is only meaningful if is_protected is + * TRUE. In this circumstance, it indicates whether the * entry has been protected read only, or read/write. * * If the entry has been protected read only (i.e. is_protected - * and is_read_only are both TRUE), we allow the entry to be + * and is_read_only are both TRUE), we allow the entry to be * protected more than once. * - * In this case, the number of readers is maintained in the + * In this case, the number of readers is maintained in the * ro_ref_count field (see below), and unprotect calls simply * decrement that field until it drops to zero, at which point * the entry is actually unprotected. * - * ro_ref_count: Integer field used to maintain a count of the number of + * ro_ref_count: Integer field used to maintain a count of the number of * outstanding read only protects on this entry. This field * must be zero whenever either is_protected or is_read_only * are TRUE. @@ -720,7 +720,7 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr, * is in the process of being flushed. This allows the cache * to detect when a call is the result of a flush callback. * - * destroy_in_progress: Boolean flag that is set to true iff the entry + * destroy_in_progress: Boolean flag that is set to true iff the entry * is in the process of being flushed and destroyed. * * @@ -811,24 +811,24 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr, * the specified transaction has made it to disk, we will * reset this field to zero as well. * - * We must maintain this field, as to avoid messages from - * the future, we must not flush a dirty entry to disk - * until the last transaction in which it was dirtied + * We must maintain this field, as to avoid messages from + * the future, we must not flush a dirty entry to disk + * until the last transaction in which it was dirtied * has made it to disk in the journal file. * - * trans_next: Next pointer in the entries modified in the current + * trans_next: Next pointer in the entries modified in the current * transaction list. This field should always be null - * unless journaling is enabled, the entry is dirty, + * unless journaling is enabled, the entry is dirty, * and last_trans field contains the current transaction - * number. Even if all these conditions are fulfilled, - * the field will still be NULL if this is the last + * number. Even if all these conditions are fulfilled, + * the field will still be NULL if this is the last * entry on the list. * - * trans_prev: Previous pointer in the entries modified in the current + * trans_prev: Previous pointer in the entries modified in the current * transaction list. This field should always be null - * unless journaling is enabled, the entry is dirty, + * unless journaling is enabled, the entry is dirty, * and last_trans field contains the current transaction - * number. Even if all these conditions are fulfilled, + * number. Even if all these conditions are fulfilled, * the field will still be NULL if this is the first * entry on the list. * @@ -1045,7 +1045,7 @@ typedef struct H5C2_cache_entry_t * * * With a little thought, it should be obvious that the above flash - * cache size increase algorithm is not sufficient for all + * cache size increase algorithm is not sufficient for all * circumstances -- for example, suppose the user round robins through * (1/flash_threshold) +1 groups, adding one data set to each on each * pass. Then all will increase in size at about the same time, requiring @@ -1062,11 +1062,11 @@ typedef struct H5C2_cache_entry_t * flash_incr_mode section. This field is ignored unless flash_incr_mode * is H5C_flash_incr__add_space. * - * flash_threshold: Double containing the factor by which current max cache - * size is multiplied to obtain the size threshold for the add_space - * flash increment algorithm. The field is ignored unless + * flash_threshold: Double containing the factor by which current max cache + * size is multiplied to obtain the size threshold for the add_space + * flash increment algorithm. The field is ignored unless * flash_incr_mode is H5C2_flash_incr__add_space. - * + * * * Cache size decrease control fields: * @@ -1273,14 +1273,14 @@ typedef struct H5C2_auto_size_ctl_t * * structure H5C2_mdj_config_t * - * H5C2_mdj_config_t is a structure intended for use in comminicating - * metadata journaling configuration data to and from the metadata - * cache. + * H5C2_mdj_config_t is a structure intended for use in comminicating + * metadata journaling configuration data to and from the metadata + * cache. * * In its initial incarnation, it is identical to the H5AC2_jnl_config_t - * structure less ther version, and journal_recovered fields. However, - * in the future we may support other types of journaling -- which will - * likely require modification or replacement of the H5AC2_jnl_config_t + * structure less ther version, and journal_recovered fields. However, + * in the future we may support other types of journaling -- which will + * likely require modification or replacement of the H5AC2_jnl_config_t * structure. * * The fields of the structure are discussed individually below. Note @@ -1300,7 +1300,7 @@ typedef struct H5C2_auto_size_ctl_t * * At present, the length of the journal file path is restricted to * no more than H5C2__MAX_JOURNAL_FILE_NAME_LEN (which must equal - * H5AC2__MAX_JOURNAL_FILE_NAME_LEN). + * H5AC2__MAX_JOURNAL_FILE_NAME_LEN). * * jbrb_buf_size: size_t containing the size of each individual buffer * in the journal buffer ring buffer. This size should be chosen @@ -1636,7 +1636,7 @@ H5_DLL herr_t H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr); H5_DLL herr_t H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr); -H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, +H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, size_t size, const char * data, hbool_t is_end_trans, diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index 7c04ea2..f0623b0 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -43,12 +43,12 @@ /* Get needed headers */ #include "H5SLprivate.h" /* Skip lists */ -/* With the introduction of the fractal heap, it is now possible for +/* With the introduction of the fractal heap, it is now possible for * entries to be dirtied, resized, and/or renamed in the flush callbacks. * As a result, on flushes, it may be necessary to make multiple passes * through the slist before it is empty. The H5C__MAX_PASSES_ON_FLUSH * #define is used to set an upper limit on the number of passes. - * The current value was obtained via personal communication with + * The current value was obtained via personal communication with * Quincey. I have applied a fudge factor of 2. */ @@ -99,7 +99,7 @@ * magic: Unsigned 32 bit integer always set to H5C__H5C_T_MAGIC. This * field is used to validate pointers to instances of H5C_t. * - * flush_in_progress: Boolean flag indicating whether a flush is in + * flush_in_progress: Boolean flag indicating whether a flush is in * progress. * * trace_file_ptr: File pointer pointing to the trace file, which is used @@ -108,7 +108,7 @@ * no trace file should be recorded. * * Since much of the code supporting the parallel metadata - * cache is in H5AC, we don't write the trace file from + * cache is in H5AC, we don't write the trace file from * H5C. Instead, H5AC reads the trace_file_ptr as needed. * * When we get to using H5C in other places, we may add @@ -181,10 +181,10 @@ * writes. The following field is used to implement this. * * evictions_enabled: Boolean flag that is initialized to TRUE. When - * this flag is set to FALSE, the metadata cache will not + * this flag is set to FALSE, the metadata cache will not * attempt to evict entries to make space for newly protected * entries, and instead the will grow without limit. - * + * * Needless to say, this feature must be used with care. * * @@ -255,7 +255,7 @@ * following two fields have been added. They are only compiled in when * H5C_DO_SANITY_CHECKS is TRUE. * - * slist_len_increase: Number of entries that have been added to the + * slist_len_increase: Number of entries that have been added to the * slist since the last time this field was set to zero. * * slist_size_increase: Total size of all entries that have been added @@ -468,13 +468,13 @@ * flash_size_increase_possible: Depending on the configuration data given * in the resize_ctl field, it may or may not be possible * for a flash size increase to occur. We set this flag - * whenever we receive a new configuration so as to avoid + * whenever we receive a new configuration so as to avoid * repeated calculations. * * flash_size_increase_threshold: If a flash cache size increase is possible, * this field is used to store the minimum size of a new entry - * or size increase needed to trigger a flash cache size - * increase. Note that this field must be updated whenever + * or size increase needed to trigger a flash cache size + * increase. Note that this field must be updated whenever * the size of the cache is changed. * * size_decrease_possible: Depending on the configuration data given @@ -592,9 +592,9 @@ * equal to the array index has not been in cache when * requested in the current epoch. * - * write_protects: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The - * cells are used to record the number of times an entry with - * type id equal to the array index has been write protected + * write_protects: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The + * cells are used to record the number of times an entry with + * type id equal to the array index has been write protected * in the current epoch. * * Observe that (hits + misses) = (write_protects + read_protects). @@ -606,9 +606,9 @@ * * Observe that (hits + misses) = (write_protects + read_protects). * - * max_read_protects: Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1. - * The cells are used to maximum number of simultaneous read - * protects on any entry with type id equal to the array index + * max_read_protects: Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1. + * The cells are used to maximum number of simultaneous read + * protects on any entry with type id equal to the array index * in the current epoch. * * insertions: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The cells @@ -616,9 +616,9 @@ * id equal to the array index has been inserted into the * cache in the current epoch. * - * pinned_insertions: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry - * with type id equal to the array index has been inserted + * pinned_insertions: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry + * with type id equal to the array index has been inserted * pinned into the cache in the current epoch. * * clears: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The cells @@ -641,13 +641,13 @@ * id equal to the array index has been renamed in the current * epoch. * - * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry + * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry * with type id equal to the array index has been renamed * during its flush callback in the current epoch. * - * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. - * The cells are used to record the number of times an entry + * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. + * The cells are used to record the number of times an entry * with type id equal to the array index has been renamed * during a cache flush in the current epoch. * @@ -686,14 +686,14 @@ * with type id equal to the array index has decreased in * size in the current epoch. * - * entry_flush_size_changes: Array of int64 of length - * H5C__MAX_NUM_TYPE_IDS + 1. The cells are used to record - * the number of times an entry with type id equal to the + * entry_flush_size_changes: Array of int64 of length + * H5C__MAX_NUM_TYPE_IDS + 1. The cells are used to record + * the number of times an entry with type id equal to the * array index has changed size while in its flush callback. * - * cache_flush_size_changes: Array of int64 of length - * H5C__MAX_NUM_TYPE_IDS + 1. The cells are used to record - * the number of times an entry with type id equal to the + * cache_flush_size_changes: Array of int64 of length + * H5C__MAX_NUM_TYPE_IDS + 1. The cells are used to record + * the number of times an entry with type id equal to the * array index has changed size during a cache flush * * total_ht_insertions: Number of times entries have been inserted into the @@ -868,7 +868,7 @@ struct H5C_t hbool_t size_increase_possible; hbool_t flash_size_increase_possible; - size_t flash_size_increase_threshold; + size_t flash_size_increase_threshold; hbool_t size_decrease_possible; hbool_t resize_enabled; hbool_t cache_full; diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index 53dcf0d..b50227b 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -222,7 +222,7 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr, * of the LRU when this situation occurs. * * This field is only compiled in debug mode. - * + * * addr: Base address of the cache entry on disk. * * size: Length of the cache entry on disk. Note that unlike normal @@ -286,20 +286,20 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr, * Note that protected entries are removed from the LRU lists * and inserted on the protected list. * - * is_read_only: Boolean flag that is only meaningful if is_protected is - * TRUE. In this circumstance, it indicates whether the + * is_read_only: Boolean flag that is only meaningful if is_protected is + * TRUE. In this circumstance, it indicates whether the * entry has been protected read only, or read/write. * * If the entry has been protected read only (i.e. is_protected - * and is_read_only are both TRUE), we allow the entry to be + * and is_read_only are both TRUE), we allow the entry to be * protected more than once. * - * In this case, the number of readers is maintained in the + * In this case, the number of readers is maintained in the * ro_ref_count field (see below), and unprotect calls simply * decrement that field until it drops to zero, at which point * the entry is actually unprotected. * - * ro_ref_count: Integer field used to maintain a count of the number of + * ro_ref_count: Integer field used to maintain a count of the number of * outstanding read only protects on this entry. This field * must be zero whenever either is_protected or is_read_only * are TRUE. @@ -361,7 +361,7 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr, * is in the process of being flushed. This allows the cache * to detect when a call is the result of a flush callback. * - * destroy_in_progress: Boolean flag that is set to true iff the entry + * destroy_in_progress: Boolean flag that is set to true iff the entry * is in the process of being flushed and destroyed. * * @@ -623,21 +623,21 @@ typedef struct H5C_cache_entry_t * * The addition of the flash increment mode was occasioned by performance * problems that appear when a local heap is increased to a size in excess - * of the current cache size. While the existing re-size code dealt with - * this eventually, performance was very bad for the remainder of the + * of the current cache size. While the existing re-size code dealt with + * this eventually, performance was very bad for the remainder of the * epoch. - * + * * At present, there are two possible values for the flash_incr_mode: * - * H5C_flash_incr__off: Don't perform flash increases in the size of - * the cache. + * H5C_flash_incr__off: Don't perform flash increases in the size of + * the cache. * - * H5C_flash_incr__add_space: Let x be either the size of a newly - * newly inserted entry, or the number of bytes by which the + * H5C_flash_incr__add_space: Let x be either the size of a newly + * newly inserted entry, or the number of bytes by which the * size of an existing entry has been increased. * - * If - * x > flash_threshold * current max cache size, + * If + * x > flash_threshold * current max cache size, * * increase the current maximum cache size by x * flash_multiple * less any free space in the cache, and start a new epoch. For @@ -646,28 +646,28 @@ typedef struct H5C_cache_entry_t * * With a little thought, it should be obvious that the above flash * cache size increase algorithm is not sufficient for all circumstances -- - * for example, suppose the user round robins through - * (1/flash_threshold) +1 groups, adding one data set to each on each - * pass. Then all will increase in size at about the same time, requiring - * the max cache size to at least double to maintain acceptable - * performance, however the above flash increment algorithm will not be + * for example, suppose the user round robins through + * (1/flash_threshold) +1 groups, adding one data set to each on each + * pass. Then all will increase in size at about the same time, requiring + * the max cache size to at least double to maintain acceptable + * performance, however the above flash increment algorithm will not be * triggered. * - * Hopefully, the add space algorithm detailed above will be sufficient - * for the performance problems encountered to date. However, we should + * Hopefully, the add space algorithm detailed above will be sufficient + * for the performance problems encountered to date. However, we should * expect to revisit the issue. * - * flash_multiple: Double containing the multiple described above in the - * H5C_flash_incr__add_space section of the discussion of the - * flash_incr_mode section. This field is ignored unless flash_incr_mode + * flash_multiple: Double containing the multiple described above in the + * H5C_flash_incr__add_space section of the discussion of the + * flash_incr_mode section. This field is ignored unless flash_incr_mode * is H5C_flash_incr__add_space. * * flash_threshold: Double containing the factor by which current max cache size - * is multiplied to obtain the size threshold for the add_space flash - * increment algorithm. The field is ignored unless flash_incr_mode is + * is multiplied to obtain the size threshold for the add_space flash + * increment algorithm. The field is ignored unless flash_incr_mode is * H5C_flash_incr__add_space. * - * + * * Cache size decrease control fields: * * decr_mode: Instance of the H5C_cache_decr_mode enumerated type whose diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index aefa4e0..d4ac4ac 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -1317,12 +1317,12 @@ done: * *------------------------------------------------------------------------- */ -hbool_t +hbool_t H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr) { const H5D_t *dataset = io_info->dset; hbool_t ret_value; - + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cacheable) HDassert(io_info); @@ -1373,13 +1373,13 @@ H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr) * *------------------------------------------------------------------------- */ -static hbool_t +static hbool_t H5D_chunk_in_cache(const H5D_t *dset, const hsize_t *chunk_offset, hsize_t chunk_idx) { H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);/*raw data chunk cache*/ hbool_t found = FALSE; /*already in cache? */ - + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_in_cache) /* Sanity checks */ @@ -2423,7 +2423,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, if(NULL == (chunk = H5D_chunk_alloc(chunk_size, pline))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for raw data chunk") - + /* In the case that some dataset functions look through this data, * clear it to all 0s. */ HDmemset(chunk, 0, chunk_size); @@ -4106,7 +4106,7 @@ H5D_chunk_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk") /* Check for reference datatype and no expanding references & clear background buffer */ - if(!cpy_info->expand_ref && + if(!cpy_info->expand_ref && ((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst))) /* Reset value to zero */ HDmemset(bkg, 0, buf_size); diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 0458e74..bc3d475 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -319,7 +319,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, +H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, H5O_layout_t *layout_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id) { hid_t tid_src = -1; /* Datatype ID for source datatype */ @@ -458,7 +458,7 @@ H5D_compact_copy(H5F_t *f_src, H5O_layout_t *layout_src, H5F_t *f_dst, /* Type conversion not necessary */ HDmemcpy(layout_dst->u.compact.buf, layout_src->u.compact.buf, layout_src->u.compact.size); } /* end if */ - else + else /* Type conversion not necessary */ HDmemcpy(layout_dst->u.compact.buf, layout_src->u.compact.buf, layout_src->u.compact.size); diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index f751298..779071f 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -243,7 +243,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id) while(npoints > 0) { size_t curr_points; /* Number of elements to write on this iteration of the loop */ size_t size; /* Size of buffer to write */ - + /* Compute # of elements and buffer size to write for this iteration */ curr_points = MIN(fb_info.elmts_per_buf, npoints); size = curr_points * fb_info.file_elmt_size; @@ -544,7 +544,7 @@ H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size) HDassert(io_info); - if(H5D_contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, + if(H5D_contig_writevv(io_info, (size_t)1, &dset_curr_seq, &dset_len, &dset_off, (size_t)1, &mem_curr_seq, &mem_len, &mem_off) < 0) HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed") @@ -1157,7 +1157,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, +H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, H5O_layout_t *layout_dst, H5T_t *dt_src, H5O_copy_t *cpy_info, hid_t dxpl_id) { haddr_t addr_src; /* File offset in source dataset */ @@ -1278,7 +1278,7 @@ H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, if(H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) { /* Need to fix values of references when copying across files */ if(f_src != f_dst) - fix_ref = TRUE; + fix_ref = TRUE; } /* end if */ /* Set the number of bytes to read & write to the buffer size */ diff --git a/src/H5Dfill.c b/src/H5Dfill.c index c2441b7..da6f2c2 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -166,7 +166,7 @@ done: If there's VL type of data, the address of the data is copied multiple times into the buffer, causing some trouble when the data is released. Instead, make multiple copies of fill value first, then do conversion - on each element so that each of them has a copy of the VL data. + on each element so that each of them has a copy of the VL data. --------------------------------------------------------------------------*/ herr_t H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, @@ -237,9 +237,9 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register types for conversion") } /* end if */ - /* If there's VL type of data, make multiple copies of fill value first, - * then do conversion on each element so that each of them has a copy - * of the VL data. + /* If there's VL type of data, make multiple copies of fill value first, + * then do conversion on each element so that each of them has a copy + * of the VL data. */ if(TRUE == H5T_detect_class(fill_type, H5T_VLEN)) { H5D_dxpl_cache_t _dxpl_cache; /* Data transfer property cache buffer */ diff --git a/src/H5Dint.c b/src/H5Dint.c index b45d7df..024f66b 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1200,7 +1200,7 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id, if(H5FO_top_incr(new_dset->oloc.file, new_dset->oloc.addr) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINC, NULL, "can't incr object ref. count") if(H5FO_insert(new_dset->oloc.file, new_dset->oloc.addr, new_dset->shared, TRUE) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects") + HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, NULL, "can't insert dataset into list of open objects") new_dset->shared->fo_count = 1; diff --git a/src/H5Dio.c b/src/H5Dio.c index 2160190..41f1021 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -165,9 +165,9 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer") /* If the buffer is nil, and 0 element is selected, make a fake buffer. - * This is for some MPI package like ChaMPIon on NCSA's tungsten which - * doesn't support this feature. - */ + * This is for some MPI package like ChaMPIon on NCSA's tungsten which + * doesn't support this feature. + */ if(!buf) buf = &fake_char; @@ -255,11 +255,11 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms") if(!buf && H5S_GET_SELECT_NPOINTS(file_space) != 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no output buffer") - + /* If the buffer is nil, and 0 element is selected, make a fake buffer. - * This is for some MPI package like ChaMPIon on NCSA's tungsten which - * doesn't support this feature. - */ + * This is for some MPI package like ChaMPIon on NCSA's tungsten which + * doesn't support this feature. + */ if(!buf) buf = &fake_char; diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index a87c9d3..77f92b2 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -15,7 +15,7 @@ /* * Programmer: rky 980813 - * KY 2005 revised the code and made the change to support and optimize + * KY 2005 revised the code and made the change to support and optimize * collective IO support. * Purpose: Functions to read/write directly between app buffer and file. * @@ -557,10 +557,10 @@ done: /*------------------------------------------------------------------------- * Function: H5D_chunk_collective_io * - * Purpose: Routine for - * 1) choose an IO option: + * Purpose: Routine for + * 1) choose an IO option: * a) One collective IO defined by one MPI derived datatype to link through all chunks - * or b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted + * or b) multiple chunk IOs,to do MPI-IO for each chunk, the IO mode may be adjusted * due to the selection pattern for each chunk. * For option a) * 1. Sort the chunk address, obtain chunk info according to the sorted chunk address @@ -572,10 +572,10 @@ done: * 1. Use MPI_gather and MPI_Bcast to obtain information of *collective/independent/none* * IO mode for each chunk of the selection * 2. Depending on whether the IO mode is collective or independent or none, - * Create either MPI derived datatype for each chunk to do collective IO or + * Create either MPI derived datatype for each chunk to do collective IO or * just do independent IO or independent IO with file set view * 3. Set up collective IO property list for collective mode - * 4. DO IO + * 4. DO IO * * Return: Non-negative on success/Negative on failure * @@ -584,7 +584,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm) { @@ -595,7 +595,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info #ifdef H5_HAVE_INSTRUMENTED_LIBRARY htri_t temp_not_link_io = FALSE; #endif - herr_t ret_value = SUCCEED; + herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_collective_io) @@ -604,7 +604,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info HDassert(io_info->using_mpi_vfd); HDassert(type_info); HDassert(fm); - + /* Obtain the data transfer properties */ if(NULL == (dx_plist = H5I_object(io_info->dxpl_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") @@ -620,10 +620,10 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info int mpi_size; /* Number of processes in MPI job */ if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0) HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size") - + one_link_chunk_io_threshold = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME); /* step 1: choose an IO option */ @@ -777,7 +777,7 @@ done: * 1. Sort the chunk address and chunk info * 2. Build up MPI derived datatype for each chunk * 3. Build up the final MPI derived datatype - * 4. Use common collective IO routine to do MPI-IO + * 4. Use common collective IO routine to do MPI-IO * * Return: Non-negative on success/Negative on failure * @@ -803,15 +803,15 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type MPI_Aint *chunk_disp_array = NULL; MPI_Aint *chunk_mem_disp_array = NULL; int *blocklen = NULL; - int mpi_code; /* MPI return code */ - herr_t ret_value = SUCCEED; - + int mpi_code; /* MPI return code */ + herr_t ret_value = SUCCEED; + FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io) /* Get the sum # of chunks, if not already available */ if(sum_chunk < 0) { if(H5D_mpio_get_sum_chunk(io_info, fm, &sum_chunk) < 0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSWAP, FAIL, "unable to obtain the total chunk number of all processes"); } /* end if */ /* Retrieve total # of chunks in dataset */ @@ -834,7 +834,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type /* Look up address of chunk */ if(HADDR_UNDEF == (ctg_store.contig.dset_addr = H5D_chunk_get_addr(io_info->dset, io_info->dxpl_id, coords, NULL))) HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list") - + /* Check for this process having selection in this chunk */ chunk_node = H5SL_first(fm->sel_chunks); if(chunk_node == NULL) { @@ -878,7 +878,7 @@ if(H5DEBUG(D)) if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"total_chunks = %Zu, num_chunk = %Zu\n", total_chunks, num_chunk); #endif - + /* Set up MPI datatype for chunks selected */ if(num_chunk) { hsize_t mpi_mem_extra_offset; /* Extra offset for memory MPI datatype */ @@ -886,7 +886,7 @@ if(H5DEBUG(D)) size_t mpi_mem_count; /* Memory MPI datatype count */ size_t mpi_file_count; /* File MPI datatype count */ hbool_t locl_mbt_is_derived = FALSE, /* Whether the buffer (memory) type is derived and needs to be free'd */ - local_mft_is_derived = FALSE; /* Whether the file type is derived and needs to be free'd */ + local_mft_is_derived = FALSE; /* Whether the file type is derived and needs to be free'd */ int blocklen_value; /* Placeholder for array fill */ /* Allocate chunking information */ @@ -910,7 +910,7 @@ if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"after sorting the chunk address \n"); #endif - /* Obtain MPI derived datatype from all individual chunks */ + /* Obtain MPI derived datatype from all individual chunks */ for(u = 0; u < num_chunk; u++) { /* Disk MPI derived datatype */ if(H5S_mpio_space_type(chunk_addr_info_array[u].chunk_info.fspace, @@ -923,7 +923,7 @@ if(H5DEBUG(D)) type_info->dst_type_size, &chunk_mtype[u], &mpi_mem_count, &mpi_mem_extra_offset, &locl_mbt_is_derived) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_BADTYPE, FAIL, "couldn't create MPI buf type") - + /* Chunk address relative to the first chunk */ chunk_addr_info_array[u].chunk_addr -= ctg_store.contig.dset_addr; H5_ASSIGN_OVERFLOW(chunk_disp_array[u], chunk_addr_info_array[u].chunk_addr, haddr_t, MPI_Aint); @@ -977,7 +977,7 @@ if(H5DEBUG(D)) /* Set the MPI datatype */ chunk_final_ftype = MPI_BYTE; chunk_final_mtype = MPI_BYTE; - + /* buffer, file derived datatypes should be true */ mpi_buf_count = (size_t)0; } /* end else */ @@ -1033,7 +1033,7 @@ if(H5DEBUG(D)) * 1. Use MPI_gather and MPI_Bcast to obtain IO mode in each chunk(collective/independent/none) * 2. Depending on whether the IO mode is collective or independent or none, * Create either MPI derived datatype for each chunk or just do independent IO - * 3. Use common collective IO routine to do MPI-IO + * 3. Use common collective IO routine to do MPI-IO * * Return: Non-negative on success/Negative on failure * @@ -1042,7 +1042,7 @@ if(H5DEBUG(D)) * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist) { @@ -1062,7 +1062,7 @@ H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ int mpi_rank; #endif size_t u; /* Local index variable */ - herr_t ret_value = SUCCEED; + herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io) @@ -1083,7 +1083,7 @@ if(H5DEBUG(D)) #endif /* Obtain IO option for each chunk */ - if(H5D_obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0) + if(H5D_obtain_mpio_mode(io_info, fm, dx_plist, chunk_io_option, chunk_addr) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTRECV, FAIL, "unable to obtain MPIO mode") /* Set up contiguous I/O info object */ @@ -1127,7 +1127,7 @@ if(H5DEBUG(D)) store.chunk.index = chunk_info->index; } /* end if */ - /* Collective IO for this chunk, + /* Collective IO for this chunk, * Note: even there is no selection for this process, the process still * needs to contribute MPI NONE TYPE. */ @@ -1136,7 +1136,7 @@ if(H5DEBUG(D)) if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"inside collective chunk IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u); #endif - + /* Set the file & memory dataspaces */ if(chunk_info) { fspace = chunk_info->fspace; @@ -1157,7 +1157,7 @@ if(H5DEBUG(D)) HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't switch to collective I/O") last_coll_opt_mode = H5FD_MPIO_COLLECTIVE_IO; } /* end if */ - + /* Initialize temporary contiguous storage address */ ctg_store.contig.dset_addr = chunk_addr[u]; @@ -1170,7 +1170,7 @@ if(H5DEBUG(D)) if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"inside independent IO mpi_rank = %d, chunk index = %Zu\n", mpi_rank, u); #endif - + HDassert(chunk_io_option[u] == 0); #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS) @@ -1296,14 +1296,14 @@ done: * to replace the independent IO when we find this chunk is not good to * do collective IO. However, according to our performance study, * this approach may not overcome the overhead caused by MPI gather/scatter. - * So we decide to leave the original collective IO per chunk approach as + * So we decide to leave the original collective IO per chunk approach as * an option for users. NO MPI gather/scatter calls are used. * HDF5 will try to collective IO if possible. - * If users choose to use + * If users choose to use * H5Pset_dxpl_mpio_chunk_opt(dxpl_id,H5FD_MPIO_OPT_MULTI_IO), - * this function will be called. - * The HDF5 library won't do any IO management but leave it to MPI-IO to figure - * out. + * this function will be called. + * The HDF5 library won't do any IO management but leave it to MPI-IO to figure + * out. * * Return: Non-negative on success/Negative on failure * @@ -1312,7 +1312,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist) { @@ -1326,7 +1326,7 @@ H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info, int min_chunk = -1; /* Minimum # of chunks all processes will operate on */ int count_chunk; /* How many chunks have we operated on? */ H5D_storage_t store; /* union of EFL and chunk pointer in file space */ - herr_t ret_value = SUCCEED; + herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt) @@ -1336,7 +1336,7 @@ if(H5DEBUG(D)) { mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file); HDfprintf(H5DEBUG(D), "coming to multi_chunk_collective_io_no_opt\n"); -} +} #endif /* Set up contiguous I/O info object */ @@ -1383,7 +1383,7 @@ if(H5DEBUG(D)) { /* Reset flags for changing parallel I/O mode */ make_ind = make_coll = FALSE; - + count_chunk++; /* If the number of chunk is greater than minimum number of chunk, @@ -1396,7 +1396,7 @@ if(H5DEBUG(D)) { /* This case needs to be improved to check if the selected space is regular. If all selections are regular, collective IO can still be done. However, since we find an MPI-IO bug at a DOE machine(mcr) that cannot - handle collective I/O selection for this case correctly, + handle collective I/O selection for this case correctly, we turn off this optimization but leave the following code for future optimization. Otherwise, the following else {} doesn't make sense. KY 2006/8/4/ */ @@ -1505,7 +1505,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, const H5S_t *file_space, const H5S_t *mem_space) { @@ -1513,7 +1513,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info hbool_t mbt_is_derived = FALSE; hbool_t mft_is_derived = FALSE; MPI_Datatype mpi_file_type, mpi_buf_type; - int mpi_code; /* MPI return code */ + int mpi_code; /* MPI return code */ herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io) @@ -1532,7 +1532,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info } /* end if */ else { /* For non-selection, participate with a none MPI derived datatype, the count is 0. */ - mpi_buf_type = MPI_BYTE; + mpi_buf_type = MPI_BYTE; mpi_file_type = MPI_BYTE; mpi_buf_count = (size_t)0; mbt_is_derived = FALSE; @@ -1576,11 +1576,11 @@ if(H5DEBUG(D)) * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, size_t mpi_buf_count, MPI_Datatype *mpi_file_type, MPI_Datatype *mpi_buf_type) { - int mpi_code; /* MPI return code */ + int mpi_code; /* MPI return code */ hbool_t plist_is_setup = FALSE; /* Whether the dxpl has been customized */ herr_t ret_value = SUCCEED; @@ -1609,7 +1609,7 @@ done: HDONE_ERROR(H5E_DATASPACE, H5E_CANTFREE, FAIL, "unable to reset dxpl values") #ifdef H5D_DEBUG -if(H5DEBUG(D)) +if(H5DEBUG(D)) HDfprintf(H5DEBUG(D),"ret_value before leaving final_collective_io=%d\n",ret_value); #endif FUNC_LEAVE_NOAPI(ret_value) @@ -1630,8 +1630,8 @@ if(H5DEBUG(D)) * Parameters: * Input: H5D_io_info_t* io_info, * H5D_chunk_map_t *fm(global chunk map struct) - * Input/Output: H5D_chunk_addr_info_t chunk_addr_info_array[] : array to store chunk address and information - * many_chunk_opt : flag to optimize the way to obtain chunk addresses + * Input/Output: H5D_chunk_addr_info_t chunk_addr_info_array[] : array to store chunk address and information + * many_chunk_opt : flag to optimize the way to obtain chunk addresses * for many chunks * * Return: Non-negative on success/Negative on failure @@ -1641,7 +1641,7 @@ if(H5DEBUG(D)) * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, H5D_chunk_addr_info_t chunk_addr_info_array[], int sum_chunk) { @@ -1656,14 +1656,14 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, int mpi_code; /* MPI return code */ int i; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - + FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk) /* Retrieve # of MPI processes */ if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0) HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size") - /* Calculate the actual threshold to obtain all chunk addresses collectively + /* Calculate the actual threshold to obtain all chunk addresses collectively * The bigger this number is, the more possible the use of obtaining chunk * address collectively. */ @@ -1677,7 +1677,7 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm, many_chunk_opt = H5D_OBTAIN_ALL_CHUNK_ADDR_COL; #ifdef H5D_DEBUG -if(H5DEBUG(D)) +if(H5DEBUG(D)) HDfprintf(H5DEBUG(D), "many_chunk_opt= %d\n", many_chunk_opt); #endif @@ -1715,12 +1715,12 @@ if(H5DEBUG(D)) while(chunk_node) { if(NULL == (chunk_info = H5SL_item(chunk_node))) HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL,"couldn't get chunk info from skipped list") - + if(many_chunk_opt == H5D_OBTAIN_ONE_CHUNK_ADDR_IND) { if(HADDR_UNDEF == (chunk_addr = H5D_chunk_get_addr(io_info->dset, io_info->dxpl_id, chunk_info->coords, NULL))) HGOTO_ERROR(H5E_STORAGE, H5E_CANTGET, FAIL, "couldn't get chunk info from skipped list") } /* end if */ - else + else chunk_addr = total_chunk_addr_array[chunk_info->index]; /* Check if chunk addresses are not in increasing order in the file */ @@ -1752,7 +1752,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5D_sort_chunk() */ - + /*------------------------------------------------------------------------- * Function: H5D_obtain_mpio_mode @@ -1763,7 +1763,7 @@ done: * Description: * * 1) Each process provides two piece of information for all chunks having selection - * a) chunk index + * a) chunk index * b) wheather this chunk is regular(for MPI derived datatype not working case) * * 2) Gather all the information to the root process @@ -1790,7 +1790,7 @@ done: * *------------------------------------------------------------------------- */ -static herr_t +static herr_t H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, H5P_genplist_t *dx_plist, uint8_t assign_io_mode[], haddr_t chunk_addr[]) { @@ -1801,7 +1801,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, uint8_t* recv_io_mode_info=NULL; uint8_t* mergebuf=NULL; uint8_t* tempbuf; - H5SL_node_t* chunk_node; + H5SL_node_t* chunk_node; H5D_chunk_info_t* chunk_info; int mpi_size,mpi_rank; MPI_Comm comm; @@ -1817,7 +1817,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode) /* Assign the rank 0 to the root */ - root = 0; + root = 0; comm = io_info->comm; /* Obtain the number of process and the current rank of the process */ @@ -1825,7 +1825,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi rank") if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0) HGOTO_ERROR(H5E_IO, H5E_MPI, FAIL, "unable to obtain mpi size") - + /* Setup parameters */ H5_ASSIGN_OVERFLOW(total_chunks, fm->total_chunks, hsize_t, int); percent_nproc_per_chunk = H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME); @@ -1833,22 +1833,22 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, chunk_opt_mode = (H5FD_mpio_chunk_opt_t)H5P_peek_unsigned(dx_plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME); if((chunk_opt_mode == H5FD_MPIO_CHUNK_MULTI_IO) || (percent_nproc_per_chunk == 0)) { if(H5D_chunk_addrmap(io_info, chunk_addr, fm->down_chunks) < 0) - HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address"); + HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get chunk address"); for(ic = 0; ic < total_chunks; ic++) assign_io_mode[ic] = H5D_CHUNK_IO_MODE_COL; HGOTO_DONE(SUCCEED) } /* end if */ -#endif +#endif threshold_nproc_per_chunk = mpi_size * percent_nproc_per_chunk/100; /* Allocate memory */ io_mode_info = (uint8_t *)H5MM_calloc(total_chunks); mergebuf = H5MM_malloc((sizeof(haddr_t) + 1) * total_chunks); tempbuf = mergebuf + total_chunks; - if(mpi_rank == root) + if(mpi_rank == root) recv_io_mode_info = (uint8_t *)H5MM_malloc(total_chunks * mpi_size); - + mem_cleanup = 1; /* Obtain the regularity and selection information for all chunks in this process. */ @@ -1868,7 +1868,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, #endif chunk_node = H5SL_next(chunk_node); } /* end while */ - + /*Gather all the information */ if(MPI_SUCCESS != (mpi_code = MPI_Gather(io_mode_info, total_chunks, MPI_BYTE, recv_io_mode_info, total_chunks, MPI_BYTE, root, comm))) HMPI_GOTO_ERROR(FAIL, "MPI_Gather failed", mpi_code) @@ -1881,7 +1881,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, int* ind_this_chunk; #endif - /* pre-computing: calculate number of processes and + /* pre-computing: calculate number of processes and regularity of the selection occupied in each chunk */ nproc_per_chunk = (int*)H5MM_calloc(total_chunks * sizeof(int)); #if !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS) @@ -1956,7 +1956,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, new_value = 0; if(H5Pset(io_info->dxpl_id, H5D_XFER_COLL_CHUNK_MULTI_RATIO_COLL_NAME, &new_value) < 0) HGOTO_ERROR(H5E_PLIST, H5E_UNSUPPORTED, FAIL, "unable to set property value") -#else +#else for(ic = 0; ic < total_chunks; ic++) { if(assign_io_mode[ic] == H5D_CHUNK_IO_MODE_COL) { new_value = 0; @@ -1985,12 +1985,12 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm, } /* end if */ } /* end if */ #endif - + done: if(mem_cleanup) { HDfree(io_mode_info); HDfree(mergebuf); - if(mpi_rank == root) + if(mpi_rank == root) HDfree(recv_io_mode_info); } /* end if */ @@ -2003,7 +2003,7 @@ H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2) haddr_t addr1, addr2; FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_cmp_chunk_addr) - + addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr; addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr; diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index bb7d13c..a8fbc43 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -193,7 +193,7 @@ typedef struct H5D_io_info_t { H5FD_mpio_xfer_t xfer_mode; /* Parallel transfer for this request (H5D_XFER_IO_XFER_MODE_NAME) */ H5FD_mpio_collective_opt_t coll_opt_mode; /* Parallel transfer with independent IO or collective IO with this mode */ H5D_io_ops_t io_ops; /* I/O operation function pointers */ - } orig; + } orig; #endif /* H5_HAVE_PARALLEL */ H5D_storage_t *store; /* Dataset storage info */ H5D_layout_ops_t layout_ops; /* Dataset layout I/O operation function pointers */ @@ -257,7 +257,7 @@ typedef struct H5D_chunk_ud_t { uint32_t nbytes; /*size of stored data */ unsigned filter_mask; /*excluded filters */ haddr_t addr; /*file address of chunk */ -} H5D_chunk_ud_t; +} H5D_chunk_ud_t; /* Typedef for "generic" chunk callbacks */ typedef int (*H5D_chunk_cb_func_t)(const H5D_chunk_rec_t *chunk_rec, @@ -564,7 +564,7 @@ H5_DLL ssize_t H5D_contig_readvv(const H5D_io_info_t *io_info, H5_DLL ssize_t H5D_contig_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]); -H5_DLL herr_t H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, +H5_DLL herr_t H5D_contig_copy(H5F_t *f_src, const H5O_layout_t *layout_src, H5F_t *f_dst, H5O_layout_t *layout_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info, hid_t dxpl_id); /* Functions that operate on chunked dataset storage */ @@ -572,7 +572,7 @@ H5_DLL hbool_t H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr); H5_DLL herr_t H5D_chunk_cinfo_cache_reset(H5D_chunk_cached_t *last); H5_DLL herr_t H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id); H5_DLL herr_t H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset); -H5_DLL haddr_t H5D_chunk_get_addr(const H5D_t *dset, hid_t dxpl_id, +H5_DLL haddr_t H5D_chunk_get_addr(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset, H5D_chunk_ud_t *udata); H5_DLL void *H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata, hbool_t relax, unsigned *idx_hint/*in,out*/); diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h index 0d8b63f..6c589e3 100644 --- a/src/H5Dpublic.h +++ b/src/H5Dpublic.h @@ -117,7 +117,7 @@ H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]); H5_DLL herr_t H5Ddebug(hid_t dset_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 3ea4c69..333ed9c 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -507,7 +507,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info * if necessary. */ - /* + /* * Gather data */ n = H5D_gather_file(io_info, file_space, &file_iter, smine_nelmts, @@ -516,7 +516,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file gather failed") /* If the source and destination are compound types and subset of each other - * and no conversion is needed, copy the data directly into user's buffer and + * and no conversion is needed, copy the data directly into user's buffer and * bypass the rest of steps. */ if(H5T_SUBSET_FALSE != type_info->cmpd_subset) { @@ -644,7 +644,7 @@ H5D_scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "mem gather failed") /* If the source and destination are compound types and the destination is - * is a subset of the source and no conversion is needed, copy the data + * is a subset of the source and no conversion is needed, copy the data * directly into user's buffer and bypass the rest of steps. If the source * is a subset of the destination, the optimization is done in conversion * function H5T_conv_struct_opt to protect the background data. @@ -705,9 +705,9 @@ done: /*------------------------------------------------------------------------- * Function: H5D_compound_opt_read * - * Purpose: A special optimization case when the source and - * destination members are a subset of each other, and - * the order is the same, and no conversion is needed. + * Purpose: A special optimization case when the source and + * destination members are a subset of each other, and + * the order is the same, and no conversion is needed. * For example: * struct source { struct destination { * TYPE1 A; --> TYPE1 A; @@ -724,7 +724,7 @@ done: * }; TYPE4 D; * TYPE5 E; * }; - * The optimization is simply moving data to the appropriate + * The optimization is simply moving data to the appropriate * places in the buffer. * * Return: Non-negative on success/Negative on failure @@ -810,7 +810,7 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space, /* Copy the data into the right place. */ for(i = 0; i < curr_nelmts; i++) { - HDmemmove(xubuf, xdbuf, type_size); + HDmemmove(xubuf, xdbuf, type_size); /* Update pointers */ xdbuf += src_stride; @@ -836,9 +836,9 @@ done: /*------------------------------------------------------------------------- * Function: H5D_compound_opt_write * - * Purpose: A special optimization case when the source and - * destination members are a subset of each other, and - * the order is the same, and no conversion is needed. + * Purpose: A special optimization case when the source and + * destination members are a subset of each other, and + * the order is the same, and no conversion is needed. * For example: * struct source { struct destination { * TYPE1 A; --> TYPE1 A; @@ -855,7 +855,7 @@ done: * }; TYPE4 D; * TYPE5 E; * }; - * The optimization is simply moving data to the appropriate + * The optimization is simply moving data to the appropriate * places in the buffer. * * @@ -887,7 +887,7 @@ H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info) xsbuf = (uint8_t *)type_info->tconv_buf; xdbuf = (uint8_t *)type_info->tconv_buf; for(i = 0; i < nelmts; i++) { - HDmemmove(xdbuf, xsbuf, dst_stride); + HDmemmove(xdbuf, xsbuf, dst_stride); /* Update pointers */ xsbuf += src_stride; diff --git a/src/H5Epublic.h b/src/H5Epublic.h index b0e93bb..932b857 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -180,7 +180,7 @@ H5_DLL ssize_t H5Eget_num(hid_t error_stack_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Eterm.h b/src/H5Eterm.h index bc4e8a7..be4863e 100644 --- a/src/H5Eterm.h +++ b/src/H5Eterm.h @@ -21,197 +21,197 @@ #define _H5Eterm_H /* Reset major error IDs */ - -H5E_DATASET_g= -H5E_FUNC_g= -H5E_STORAGE_g= -H5E_FILE_g= -H5E_SOHM_g= -H5E_SYM_g= -H5E_VFL_g= -H5E_INTERNAL_g= -H5E_BTREE_g= -H5E_REFERENCE_g= -H5E_DATASPACE_g= -H5E_RESOURCE_g= -H5E_PLIST_g= -H5E_LINK_g= -H5E_DATATYPE_g= -H5E_RS_g= -H5E_HEAP_g= -H5E_OHDR_g= -H5E_ATOM_g= -H5E_ATTR_g= -H5E_NONE_MAJOR_g= -H5E_IO_g= -H5E_SLIST_g= -H5E_EFL_g= -H5E_TST_g= -H5E_ARGS_g= -H5E_ERROR_g= -H5E_PLINE_g= -H5E_FSPACE_g= + +H5E_DATASET_g= +H5E_FUNC_g= +H5E_STORAGE_g= +H5E_FILE_g= +H5E_SOHM_g= +H5E_SYM_g= +H5E_VFL_g= +H5E_INTERNAL_g= +H5E_BTREE_g= +H5E_REFERENCE_g= +H5E_DATASPACE_g= +H5E_RESOURCE_g= +H5E_PLIST_g= +H5E_LINK_g= +H5E_DATATYPE_g= +H5E_RS_g= +H5E_HEAP_g= +H5E_OHDR_g= +H5E_ATOM_g= +H5E_ATTR_g= +H5E_NONE_MAJOR_g= +H5E_IO_g= +H5E_SLIST_g= +H5E_EFL_g= +H5E_TST_g= +H5E_ARGS_g= +H5E_ERROR_g= +H5E_PLINE_g= +H5E_FSPACE_g= H5E_CACHE_g= (-1); /* Reset minor error IDs */ -/* Generic low-level file I/O errors */ -H5E_SEEKERROR_g= -H5E_READERROR_g= -H5E_WRITEERROR_g= -H5E_CLOSEERROR_g= -H5E_OVERFLOW_g= -H5E_FCNTL_g= -H5E_SYNCFAIL_g= -H5E_TRUNCFAIL_g= +/* Generic low-level file I/O errors */ +H5E_SEEKERROR_g= +H5E_READERROR_g= +H5E_WRITEERROR_g= +H5E_CLOSEERROR_g= +H5E_OVERFLOW_g= +H5E_FCNTL_g= +H5E_SYNCFAIL_g= +H5E_TRUNCFAIL_g= H5E_REMOVEFAIL_g= -/* Resource errors */ -H5E_NOSPACE_g= -H5E_CANTALLOC_g= -H5E_CANTCOPY_g= -H5E_CANTFREE_g= -H5E_ALREADYEXISTS_g= -H5E_CANTLOCK_g= -H5E_CANTUNLOCK_g= -H5E_CANTGC_g= -H5E_CANTGETSIZE_g= +/* Resource errors */ +H5E_NOSPACE_g= +H5E_CANTALLOC_g= +H5E_CANTCOPY_g= +H5E_CANTFREE_g= +H5E_ALREADYEXISTS_g= +H5E_CANTLOCK_g= +H5E_CANTUNLOCK_g= +H5E_CANTGC_g= +H5E_CANTGETSIZE_g= H5E_OBJOPEN_g= -/* Heap errors */ -H5E_CANTRESTORE_g= -H5E_CANTCOMPUTE_g= -H5E_CANTEXTEND_g= -H5E_CANTATTACH_g= -H5E_CANTUPDATE_g= +/* Heap errors */ +H5E_CANTRESTORE_g= +H5E_CANTCOMPUTE_g= +H5E_CANTEXTEND_g= +H5E_CANTATTACH_g= +H5E_CANTUPDATE_g= H5E_CANTOPERATE_g= -/* Function entry/exit interface errors */ -H5E_CANTINIT_g= -H5E_ALREADYINIT_g= +/* Function entry/exit interface errors */ +H5E_CANTINIT_g= +H5E_ALREADYINIT_g= H5E_CANTRELEASE_g= -/* Property list errors */ -H5E_CANTGET_g= -H5E_CANTSET_g= +/* Property list errors */ +H5E_CANTGET_g= +H5E_CANTSET_g= H5E_DUPCLASS_g= -/* Free space errors */ -H5E_CANTMERGE_g= -H5E_CANTREVIVE_g= +/* Free space errors */ +H5E_CANTMERGE_g= +H5E_CANTREVIVE_g= H5E_CANTSHRINK_g= -/* Object header related errors */ -H5E_LINKCOUNT_g= -H5E_VERSION_g= -H5E_ALIGNMENT_g= -H5E_BADMESG_g= -H5E_CANTDELETE_g= -H5E_BADITER_g= -H5E_CANTPACK_g= +/* Object header related errors */ +H5E_LINKCOUNT_g= +H5E_VERSION_g= +H5E_ALIGNMENT_g= +H5E_BADMESG_g= +H5E_CANTDELETE_g= +H5E_BADITER_g= +H5E_CANTPACK_g= H5E_CANTRESET_g= -/* System level errors */ +/* System level errors */ H5E_SYSERRSTR_g= -/* I/O pipeline errors */ -H5E_NOFILTER_g= -H5E_CALLBACK_g= -H5E_CANAPPLY_g= -H5E_SETLOCAL_g= -H5E_NOENCODER_g= +/* I/O pipeline errors */ +H5E_NOFILTER_g= +H5E_CALLBACK_g= +H5E_CANAPPLY_g= +H5E_SETLOCAL_g= +H5E_NOENCODER_g= H5E_CANTFILTER_g= -/* Group related errors */ -H5E_CANTOPENOBJ_g= -H5E_CANTCLOSEOBJ_g= -H5E_COMPLEN_g= +/* Group related errors */ +H5E_CANTOPENOBJ_g= +H5E_CANTCLOSEOBJ_g= +H5E_COMPLEN_g= H5E_PATH_g= -/* No error */ +/* No error */ H5E_NONE_MINOR_g= -/* File accessability errors */ -H5E_FILEEXISTS_g= -H5E_FILEOPEN_g= -H5E_CANTCREATE_g= -H5E_CANTOPENFILE_g= -H5E_CANTCLOSEFILE_g= -H5E_NOTHDF5_g= -H5E_BADFILE_g= -H5E_TRUNCATED_g= +/* File accessability errors */ +H5E_FILEEXISTS_g= +H5E_FILEOPEN_g= +H5E_CANTCREATE_g= +H5E_CANTOPENFILE_g= +H5E_CANTCLOSEFILE_g= +H5E_NOTHDF5_g= +H5E_BADFILE_g= +H5E_TRUNCATED_g= H5E_MOUNT_g= -/* Object atom related errors */ -H5E_BADATOM_g= -H5E_BADGROUP_g= -H5E_CANTREGISTER_g= -H5E_CANTINC_g= -H5E_CANTDEC_g= +/* Object atom related errors */ +H5E_BADATOM_g= +H5E_BADGROUP_g= +H5E_CANTREGISTER_g= +H5E_CANTINC_g= +H5E_CANTDEC_g= H5E_NOIDS_g= -/* Cache related errors */ -H5E_CANTFLUSH_g= -H5E_CANTSERIALIZE_g= -H5E_CANTLOAD_g= -H5E_PROTECT_g= -H5E_NOTCACHED_g= -H5E_SYSTEM_g= -H5E_CANTINS_g= -H5E_CANTRENAME_g= -H5E_CANTPROTECT_g= -H5E_CANTUNPROTECT_g= -H5E_CANTPIN_g= -H5E_CANTUNPIN_g= -H5E_CANTMARKDIRTY_g= -H5E_CANTDIRTY_g= -H5E_CANTEXPUNGE_g= -H5E_CANTRESIZE_g= +/* Cache related errors */ +H5E_CANTFLUSH_g= +H5E_CANTSERIALIZE_g= +H5E_CANTLOAD_g= +H5E_PROTECT_g= +H5E_NOTCACHED_g= +H5E_SYSTEM_g= +H5E_CANTINS_g= +H5E_CANTRENAME_g= +H5E_CANTPROTECT_g= +H5E_CANTUNPROTECT_g= +H5E_CANTPIN_g= +H5E_CANTUNPIN_g= +H5E_CANTMARKDIRTY_g= +H5E_CANTDIRTY_g= +H5E_CANTEXPUNGE_g= +H5E_CANTRESIZE_g= H5E_CANTJOURNAL_g= -/* Link related errors */ -H5E_TRAVERSE_g= -H5E_NLINKS_g= -H5E_NOTREGISTERED_g= -H5E_CANTMOVE_g= +/* Link related errors */ +H5E_TRAVERSE_g= +H5E_NLINKS_g= +H5E_NOTREGISTERED_g= +H5E_CANTMOVE_g= H5E_CANTSORT_g= -/* Parallel MPI errors */ -H5E_MPI_g= -H5E_MPIERRSTR_g= +/* Parallel MPI errors */ +H5E_MPI_g= +H5E_MPIERRSTR_g= H5E_CANTRECV_g= -/* Dataspace errors */ -H5E_CANTCLIP_g= -H5E_CANTCOUNT_g= -H5E_CANTSELECT_g= -H5E_CANTNEXT_g= -H5E_BADSELECT_g= +/* Dataspace errors */ +H5E_CANTCLIP_g= +H5E_CANTCOUNT_g= +H5E_CANTSELECT_g= +H5E_CANTNEXT_g= +H5E_BADSELECT_g= H5E_CANTCOMPARE_g= -/* Argument errors */ -H5E_UNINITIALIZED_g= -H5E_UNSUPPORTED_g= -H5E_BADTYPE_g= -H5E_BADRANGE_g= +/* Argument errors */ +H5E_UNINITIALIZED_g= +H5E_UNSUPPORTED_g= +H5E_BADTYPE_g= +H5E_BADRANGE_g= H5E_BADVALUE_g= -/* B-tree related errors */ -H5E_NOTFOUND_g= -H5E_EXISTS_g= -H5E_CANTENCODE_g= -H5E_CANTDECODE_g= -H5E_CANTSPLIT_g= -H5E_CANTREDISTRIBUTE_g= -H5E_CANTSWAP_g= -H5E_CANTINSERT_g= -H5E_CANTLIST_g= -H5E_CANTMODIFY_g= +/* B-tree related errors */ +H5E_NOTFOUND_g= +H5E_EXISTS_g= +H5E_CANTENCODE_g= +H5E_CANTDECODE_g= +H5E_CANTSPLIT_g= +H5E_CANTREDISTRIBUTE_g= +H5E_CANTSWAP_g= +H5E_CANTINSERT_g= +H5E_CANTLIST_g= +H5E_CANTMODIFY_g= H5E_CANTREMOVE_g= -/* Datatype conversion errors */ -H5E_CANTCONVERT_g= +/* Datatype conversion errors */ +H5E_CANTCONVERT_g= H5E_BADSIZE_g= (-1); #endif /* H5Eterm_H */ @@ -43,7 +43,7 @@ #include "H5FDmulti.h" /*multiple files partitioned by mem usage */ #include "H5FDsec2.h" /*Posix unbuffered I/O */ #include "H5FDstdio.h" /* Standard C buffered I/O */ -#ifdef H5_HAVE_WINDOWS +#ifdef H5_HAVE_WINDOWS #include "H5FDwindows.h" /* Windows buffered I/O */ #endif #include "H5FDdirect.h" /*Linux direct I/O */ @@ -941,7 +941,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache") /* Create a metadata cache with modified API along side the regular - * version. For now, this is just for testing. Once we get it + * version. For now, this is just for testing. Once we get it * fully in use, we will delete the old version. */ if(H5AC2_create(f, (H5AC2_cache_config_t *)&(f->shared->mdc_initCacheCfg)) < 0) @@ -1185,7 +1185,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id) * multiple Boolean flags. * * Vailin Choi, 2008-04-02 - * To formulate path for later searching of target file for + * To formulate path for later searching of target file for * external link via H5_build_extpath(). * *------------------------------------------------------------------------- @@ -1393,7 +1393,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d config_ptr = &(file->shared->initJnlCfg); - if(H5AC2_check_for_journaling(file, dxpl_id, file->shared->cache2, + if(H5AC2_check_for_journaling(file, dxpl_id, file->shared->cache2, config_ptr->journal_recovered) < 0 ) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC2_check_for_journaling() reports failure.") @@ -1578,7 +1578,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) /* can't journal at this point as the file is not open */ /* In theory, opening the file shouldn't generate any dirty metadata, - * but we do have one case where we fix some object automatically + * but we do have one case where we fix some object automatically * when we first touch it. Can this happen here? If so, we will * have to do somethings to start a transaction before this happens. */ @@ -2154,7 +2154,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags) /* If no intent flags were passed in, exit quietly */ if(!intent_flags) HGOTO_DONE(SUCCEED) - + *intent_flags = H5F_get_intent(file); /* HDF5 uses some flags internally that users don't know about. @@ -2207,7 +2207,7 @@ H5F_get_intent(const H5F_t *f) * when searching the target file. * * Return: 'extpath' on success/abort on failure (shouldn't fail) - * + * * Programmer: Vailin Choi, April 2, 2008 * * Modifications: @@ -3385,7 +3385,7 @@ done: * * Changes: John Mainzer * 8/4/08 - * Reworked function to use the new H5AC2_jnl_config_t + * Reworked function to use the new H5AC2_jnl_config_t * structure and H5AC2_get_jnl_config(). * *------------------------------------------------------------------------- @@ -3414,7 +3414,7 @@ done: /*------------------------------------------------------------------------- * Function: H5Fget_jnl_config * - * Purpose: Retrieves the current journaling configuration, and + * Purpose: Retrieves the current journaling configuration, and * return it in *config_ptr. * * Note that the version field of *config_Ptr must be correctly @@ -3456,8 +3456,8 @@ done: /*------------------------------------------------------------------------- * Function: H5Fset_jnl_config * - * Purpose: Sets the current journaling configuration, using the - * contents of the instance of H5AC2_jnl_config_t pointed + * Purpose: Sets the current journaling configuration, using the + * contents of the instance of H5AC2_jnl_config_t pointed * to by config_ptr. * * Return: Success: SUCCEED @@ -208,9 +208,9 @@ H5FD_term_interface(void) /* Reset the VFL drivers, if they've been closed */ if(H5I_nmembers(H5I_VFL)==0) { H5FD_sec2_term(); -#ifdef H5_HAVE_DIRECT +#ifdef H5_HAVE_DIRECT H5FD_direct_term(); -#endif +#endif H5FD_log_term(); H5FD_stdio_term(); #ifdef H5_HAVE_WINDOWS diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 4c468b6..cc27173 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -370,9 +370,9 @@ done: * Modifications: * Robb Matzke, 1999-10-19 * The backing store file is created and opened if specified. - * + * * Raymond Lu, 2006-11-30 - * Enabled the driver to read an existing file depending on + * Enabled the driver to read an existing file depending on * the setting of the backing_store and file open flags. *------------------------------------------------------------------------- */ @@ -860,7 +860,7 @@ done: * Modifications: * Raymond Lu, 2006-11-30 * Added a condition check for backing store flag, for an - * existing file can be opened for read and write now. + * existing file can be opened for read and write now. *------------------------------------------------------------------------- */ /* ARGSUSED */ diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index b078511..0cd4c9f 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -18,7 +18,7 @@ * Wednesday, 20 September 2006 * * Purpose: The Direct I/O file driver forces the data to be written to - * the file directly without being copied into system kernel + * the file directly without being copied into system kernel * buffer. The main system support this feature is Linux. */ @@ -322,7 +322,7 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu if(boundary != 0) fa.mboundary = boundary; - else + else fa.mboundary = MBOUNDARY_DEF; if(block_size != 0) fa.fbsize = block_size; @@ -365,7 +365,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/, +H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/, size_t *cbuf_size/*out*/) { H5FD_direct_fapl_t *fa; @@ -573,7 +573,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd if(write(file->fd, (void*)buf1, sizeof(int))<0) { if(write(file->fd, (void*)buf2, file->fa.fbsize)<0) HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, NULL, "file system may not support Direct I/O") - else + else file->fa.must_align = TRUE; } else { file->fa.must_align = FALSE; @@ -583,7 +583,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd if(read(file->fd, (void*)buf1, sizeof(int))<0) { if(read(file->fd, (void*)buf2, file->fa.fbsize)<0) HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "file system may not support Direct I/O") - else + else file->fa.must_align = TRUE; } else file->fa.must_align = FALSE; @@ -929,20 +929,20 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha if (addr+size>file->eoa) HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow") - /* If the system doesn't require data to be aligned, read the data in + /* If the system doesn't require data to be aligned, read the data in * the same way as sec2 driver. */ _must_align = file->fa.must_align; - /* Get the memory boundary for alignment, file system block size, and maximal + /* Get the memory boundary for alignment, file system block size, and maximal * copy buffer size. */ _boundary = file->fa.mboundary; _fbsize = file->fa.fbsize; _cbsize = file->fa.cbsize; - /* if the data is aligned or the system doesn't require data to be aligned, - * read it directly from the file. If not, read a bigger + /* if the data is aligned or the system doesn't require data to be aligned, + * read it directly from the file. If not, read a bigger * and aligned data first, then copy the data into memory buffer. */ if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) { @@ -950,7 +950,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha if ((addr!=file->pos || OP_READ!=file->op) && file_seek(file->fd, (file_offset_t)addr, SEEK_SET)<0) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position") - /* Read the aligned data in file first, being careful of interrupted + /* Read the aligned data in file first, being careful of interrupted * system calls and partial results. */ while (size>0) { do { @@ -972,8 +972,8 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha buf = (char*)buf + nbytes; } } else { - /* allocate memory needed for the Direct IO option up to the maximal - * copy buffer size. Make a bigger buffer for aligned I/O if size is + /* allocate memory needed for the Direct IO option up to the maximal + * copy buffer size. Make a bigger buffer for aligned I/O if size is * smaller than maximal copy buffer. */ if(size < _cbsize) alloc_size = ((size / _fbsize) * _fbsize) + _fbsize; @@ -987,15 +987,15 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position") /* - * Read the aligned data in file into aligned buffer first, then copy the data + * Read the aligned data in file into aligned buffer first, then copy the data * into the final buffer. If the data size is bigger than maximal copy buffer * size, do the reading by segment (the outer while loop). If not, do one step - * reading. + * reading. */ p3 = buf; do { - /* Read the aligned data in file first. Not able to handle interrupted - * system calls and partial results like sec2 driver does because the + /* Read the aligned data in file first. Not able to handle interrupted + * system calls and partial results like sec2 driver does because the * data may no longer be aligned. It's expecially true when the data in * file is smaller than ALLOC_SIZE. */ HDmemset(copy_buf, 0, alloc_size); @@ -1008,7 +1008,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed") /* look for the right position and copy the data to the original buffer. - * Consider all possible situations here: file address is not aligned on + * Consider all possible situations here: file address is not aligned on * file block size; the end of data address is not aligned; the end of data * address is aligned; data size is smaller or bigger than maximal copy size.*/ p2 = (unsigned char*)copy_buf + (size_t)(copy_addr % _fbsize); @@ -1018,7 +1018,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha HDmemcpy(p3, p2, copy_size); else if(size >= _cbsize && copy_size > (alloc_size-(size_t)(copy_addr%_fbsize))) { HDmemcpy(p3, p2, (alloc_size - (size_t)(copy_addr % _fbsize))); - p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize)); + p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize)); } /* update the size and address of data being read. */ @@ -1099,20 +1099,20 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h if (addr+size>file->eoa) HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow") - /* If the system doesn't require data to be aligned, read the data in + /* If the system doesn't require data to be aligned, read the data in * the same way as sec2 driver. */ _must_align = file->fa.must_align; - /* Get the memory boundary for alignment, file system block size, and maximal + /* Get the memory boundary for alignment, file system block size, and maximal * copy buffer size. */ _boundary = file->fa.mboundary; _fbsize = file->fa.fbsize; _cbsize = file->fa.cbsize; - /* if the data is aligned or the system doesn't require data to be aligned, - * write it directly to the file. If not, read a bigger and aligned data + /* if the data is aligned or the system doesn't require data to be aligned, + * write it directly to the file. If not, read a bigger and aligned data * first, update buffer with user data, then write the data out. */ if(!_must_align || ((addr%_fbsize==0) && (size%_fbsize==0) && ((size_t)buf%_boundary==0))) { @@ -1140,7 +1140,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h * copy buffer size. Make a bigger buffer for aligned I/O if size is * smaller than maximal copy buffer. */ - if(size < _cbsize) + if(size < _cbsize) alloc_size = ((size / _fbsize) * _fbsize) + _fbsize; else alloc_size = _cbsize; @@ -1156,8 +1156,8 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h do { /* * Read the aligned data first if the aligned region doesn't fall - * entirely in the range to be writen. Not able to handle interrupted - * system calls and partial results like sec2 driver does because the + * entirely in the range to be writen. Not able to handle interrupted + * system calls and partial results like sec2 driver does because the * data may no longer be aligned. It's expecially true when the data in * file is smaller than ALLOC_SIZE. */ @@ -1172,7 +1172,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed") } - /* look for the right position and append or copy the data to be written to + /* look for the right position and append or copy the data to be written to * the aligned buffer. * Consider all possible situations here: file address is not aligned on * file block size; the end of data address is not aligned; the end of data @@ -1187,13 +1187,13 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h HDmemcpy(p1, p3, (alloc_size - (size_t)(copy_addr % _fbsize))); p3 = (unsigned char*)p3 + (alloc_size - (size_t)(copy_addr % _fbsize)); } - + /*look for the aligned position for writing the data*/ if(file_seek(file->fd, (file_offset_t)(copy_addr - copy_addr % _fbsize), SEEK_SET) < 0) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position") /* - * Write the data. It doesn't truncate the extra data introduced by + * Write the data. It doesn't truncate the extra data introduced by * alignment because that step is done in H5FD_direct_flush. */ do { @@ -1215,7 +1215,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h /*Update the address and size*/ addr += (haddr_t)size; buf = (const char*)buf + size; - + if(copy_buf) HDfree(copy_buf); } @@ -1290,15 +1290,15 @@ H5FD_direct_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing) /* Reset last file I/O information */ file->pos = HADDR_UNDEF; file->op = OP_UNKNOWN; - } - else if (file->fa.must_align){ + } + else if (file->fa.must_align){ /*Even though eof is equal to eoa, file is still truncated because Direct I/O *write introduces some extra data for alignment. */ if (-1==file_truncate(file->fd, (file_offset_t)file->eof)) HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly") } - + done: FUNC_LEAVE_NOAPI(ret_value) } diff --git a/src/H5FDdirect.h b/src/H5FDdirect.h index 79886e7..26c70f3 100644 --- a/src/H5FDdirect.h +++ b/src/H5FDdirect.h @@ -43,9 +43,9 @@ extern "C" { H5_DLL hid_t H5FD_direct_init(void); H5_DLL void H5FD_direct_term(void); -H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, +H5_DLL herr_t H5Pset_fapl_direct(hid_t fapl_id, size_t alignment, size_t block_size, size_t cbuf_size); -H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, +H5_DLL herr_t H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*out*/, size_t *cbuf_size/*out*/); #ifdef __cplusplus diff --git a/src/H5FDmpi.h b/src/H5FDmpi.h index 0384018..885e844 100644 --- a/src/H5FDmpi.h +++ b/src/H5FDmpi.h @@ -22,8 +22,8 @@ #ifndef H5FDmpi_H #define H5FDmpi_H -/***** Macros for One linked collective IO case. *****/ -/* The default value to do one linked collective IO for all chunks. +/***** Macros for One linked collective IO case. *****/ +/* The default value to do one linked collective IO for all chunks. If the average number of chunks per process is greater than this value, the library will create an MPI derived datatype to link all chunks to do collective IO. The user can set this value through an API. */ diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 89a8637..5853d05 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -544,14 +544,14 @@ Description: The library won't behave as it asks for only when we find that the low-level MPI-IO package doesn't support this. -Parameters: +Parameters: hid_t dxpl_id in: Data transfer property list identifier H5FD_mpio_chunk_opt_t in: The optimization flag for linked chunk IO or multi-chunk IO. - -Returns: -Returns a non-negative value if successful. Otherwise returns a negative value. + +Returns: +Returns a non-negative value if successful. Otherwise returns a negative value. * *------------------------------------------------------------------------- */ @@ -596,14 +596,14 @@ Description: The library won't behave as it asks for only when we find that the low-level MPI-IO package doesn't support this. -Parameters: +Parameters: hid_t dxpl_id in: Data transfer property list identifier H5FD_mpio_chunk_opt_t in: The optimization flag for linked chunk IO or multi-chunk IO. - -Returns: -Returns a non-negative value if successful. Otherwise returns a negative value. + +Returns: +Returns a non-negative value if successful. Otherwise returns a negative value. * *------------------------------------------------------------------------- */ @@ -643,15 +643,15 @@ Purpose: To set a threshold for doing linked chunk IO Description: - If the number is greater than the threshold set by the user, + If the number is greater than the threshold set by the user, the library will do linked chunk IO; otherwise, IO will be done for every chunk. -Parameters: +Parameters: hid_t dxpl_id in: Data transfer property list identifier - unsigned num_proc_per_chunk in: the threshold of the average number of chunks selected by each process + unsigned num_proc_per_chunk in: the threshold of the average number of chunks selected by each process -Returns: -Returns a non-negative value if successful. Otherwise returns a negative value. +Returns: +Returns a non-negative value if successful. Otherwise returns a negative value. * *------------------------------------------------------------------------- */ @@ -690,13 +690,13 @@ Purpose: To set a threshold for doing collective IO for each chunk Description: The library will calculate the percentage of the number of process holding selections at each chunk. If that percentage of number of process in the individual chunk is greater than the threshold set by the user, the library will do collective chunk IO for this chunk; otherwise, independent IO will be done for this chunk. -Parameters: - hid_t dxpl_id +Parameters: + hid_t dxpl_id in: Data transfer property list identifier - unsigned percent_num_proc_per_chunk + unsigned percent_num_proc_per_chunk in: the threshold of the percentage of the number of process holding selections per chunk -Returns: -Returns a non-negative value if successful. Otherwise returns a negative value. +Returns: +Returns a non-negative value if successful. Otherwise returns a negative value. * @@ -941,7 +941,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, #ifndef H5_HAVE_MPI_GET_SIZE struct stat stat_buf; #endif - + FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL) #ifdef H5FDmpio_DEBUG @@ -1016,7 +1016,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, /* Only processor p0 will get the filesize and broadcast it. */ if (mpi_rank == 0) { /* Get current file size. If MPI_File_get_size is disabled in configuration - * because it doesn't return correct value (SGI Altix Propack 4), + * because it doesn't return correct value (SGI Altix Propack 4), * use stat to get the file size. */ #ifdef H5_HAVE_MPI_GET_SIZE if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size))) @@ -1514,7 +1514,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat))) HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code) } /* end else */ - + /* * Reset the file view when we used MPI derived types */ diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 8c25a62..098e876 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1467,7 +1467,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type) * However, the library sometimes queries it through H5F_get_eoa. * Here the code finds the biggest EOA for individual file if * the query is from H5F_get_eoa (TYPE is H5FD_MEM_DEFAULT). - */ + */ if(H5FD_MEM_DEFAULT == type) { UNIQUE_MEMBERS(file->fa.memb_map, mt) { if (file->memb[mt]) { @@ -1494,7 +1494,7 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type) } END_MEMBERS; } else { H5FD_mem_t mmt = file->fa.memb_map[type]; - if (H5FD_MEM_DEFAULT==mmt) mmt = type; + if (H5FD_MEM_DEFAULT==mmt) mmt = type; if (file->memb[mmt]) { H5E_BEGIN_TRY { diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 839c8a3..89068c0 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -89,7 +89,7 @@ typedef enum H5FD_mem_t { #define H5FD_MEM_SOHM_TABLE H5FD_MEM_OHDR #define H5FD_MEM_SOHM_INDEX H5FD_MEM_BTREE -/* Per discussion with Quincey, I'm mapping the metadata journaling +/* Per discussion with Quincey, I'm mapping the metadata journaling * configuration block to super. * * JRM -- 3/20/08 diff --git a/src/H5FDspace.c b/src/H5FDspace.c index 7bd72cc..5795729 100644 --- a/src/H5FDspace.c +++ b/src/H5FDspace.c @@ -1659,7 +1659,7 @@ done: * 5 January 2007 * Due to the complexity EOA for Multi driver, this function * is made failed for now. - * + * *------------------------------------------------------------------------- */ hssize_t @@ -1684,7 +1684,7 @@ H5FD_get_freespace(const H5FD_t *file) * It doesn't have eoa for the whole file. */ if(file->driver_id == H5FD_MULTI) HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "Multi driver doesn't support this function") - + /* Retrieve the 'eoa' for the file */ eoa = file->cls->get_eoa(file, H5FD_MEM_DEFAULT); diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c index c66b1ab..628159a 100644 --- a/src/H5FDstdio.c +++ b/src/H5FDstdio.c @@ -539,8 +539,8 @@ H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */) /*------------------------------------------------------------------------- * Function: H5FD_stdio_alloc * - * Purpose: Allocates file memory. If fseeko isn't available, makes - * sure the file size isn't bigger than 2GB because the + * Purpose: Allocates file memory. If fseeko isn't available, makes + * sure the file size isn't bigger than 2GB because the * parameter OFFSET of fseek is of the type LONG INT, limiting * the file size to 2GB. * @@ -584,7 +584,7 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*UNUSED*/ type, hid_t /*UNUSED*/ dxp /* If fseeko isn't available, big files (>2GB) won't be supported. */ if((addr + size) > BIG_FILE) H5Epush_ret(func, H5E_ERR_CLS, H5E_IO, H5E_SEEKERROR, "can't write file bigger than 2GB because fseeko isn't available", HADDR_UNDEF) -#endif +#endif file->eoa = addr + size; diff --git a/src/H5FDwindows.c b/src/H5FDwindows.c index 08a8e69..d09de37 100644 --- a/src/H5FDwindows.c +++ b/src/H5FDwindows.c @@ -20,11 +20,11 @@ * * Purpose: We would like to create a driver specifically for Windows * to utilize the Win32 API, and reduce the maintenence demands - * for the other file drivers. Our other motivation is that + * for the other file drivers. Our other motivation is that * the Windows system calls of the existing sec2 driver differ * from those on other platforms, and are not 64-bit compatible. - * From the start, this will have the structure very similar - * to our sec2 driver, but make system calls more similar to + * From the start, this will have the structure very similar + * to our sec2 driver, but make system calls more similar to * our stdio driver. */ @@ -66,7 +66,7 @@ static hid_t H5FD_WINDOWS_g = 0; */ typedef struct H5FD_windows_t { H5FD_t pub; /*public stuff, must be first */ - /* + /* * .NET doesn't support our 64-bit safe stdio functions, * so we will use io.h functions instead. */ @@ -96,7 +96,7 @@ typedef struct H5FD_windows_t { /* These are used by the macros below */ -#define file_offset_t __int64 +#define file_offset_t __int64 #define fseek_offset_t __int64 /* @@ -128,7 +128,7 @@ static H5FD_t *H5FD_windows_open(const char *name, unsigned flags, hid_t fapl_id static herr_t H5FD_windows_close(H5FD_t *_file); static int H5FD_windows_cmp(const H5FD_t *_f1, const H5FD_t *_f2); static herr_t H5FD_windows_query(const H5FD_t *_f1, unsigned long *flags); -static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, +static haddr_t H5FD_windows_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size); static haddr_t H5FD_windows_get_eoa(const H5FD_t *_file, H5FD_mem_t type); static herr_t H5FD_windows_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr); @@ -346,7 +346,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, if (H5F_ACC_CREAT & flags) o_flags |= O_CREAT; if (H5F_ACC_EXCL & flags) o_flags |= O_EXCL; /* Windows needs O_BINARY to correctly handle eol characters */ - o_flags |= O_BINARY; + o_flags |= O_BINARY; /* Open the file */ if ((fd=_open(name, o_flags, 0666))<0) @@ -388,7 +388,7 @@ H5FD_windows_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, H5_ASSIGN_OVERFLOW(file->eof,sb.st_size,h5_stat_size_t,haddr_t); file->pos = HADDR_UNDEF; file->op = OP_UNKNOWN; - + #ifndef WINDOWS_USE_STDIO file->fd = fd; #else @@ -815,7 +815,7 @@ H5FD_windows_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h /* end of file but not end of format address space */ HDmemset(buf, 0, size); break; - } + } } #endif /* WINDOWS_USE_STDIO */ assert(nbytes>=0); @@ -982,7 +982,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing) /* Extend the file to make sure it's large enough */ if( (filehandle = (HANDLE)_get_osfhandle(file->fd)) == INVALID_HANDLE_VALUE) HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to get file handle for file") - + li.QuadPart = (__int64)file->eoa; (void)SetFilePointer((HANDLE)filehandle,li.LowPart,&li.HighPart,FILE_BEGIN); if(SetEndOfFile(filehandle) == 0) @@ -1010,7 +1010,7 @@ H5FD_windows_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing) /* Reset last file I/O information */ file->pos = HADDR_UNDEF; file->op = OP_UNKNOWN; - + } done: @@ -484,7 +484,7 @@ done: * * Purpose: Collect meta storage info used by the free space manager * - * Return: Success: non-negative + * Return: Success: non-negative * Failure: negative * * Programmer: Vailin Choi @@ -506,8 +506,8 @@ H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size) /* Get the free space size info */ *meta_size += H5FS_HEADER_SIZE(f) + fspace->alloc_sect_size; - - FUNC_LEAVE_NOAPI(SUCCEED) + + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5FS_size() */ diff --git a/src/H5FScache.c b/src/H5FScache.c index 2d88011..4c85824 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -77,15 +77,15 @@ static herr_t H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void * /* Metadata cache callbacks */ static void *H5FS_cache_hdr_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5FS_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, +static herr_t H5FS_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5FS_cache_hdr_free_icr(haddr_t addr, size_t len, void *thing); static void *H5FS_cache_sinfo_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5FS_cache_sinfo_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5FS_cache_sinfo_free_icr(haddr_t addr, size_t len, void *thing); @@ -145,7 +145,7 @@ const H5AC2_class_t H5AC2_FSPACE_SINFO[1] = {{ *------------------------------------------------------------------------- */ static void * -H5FS_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, +H5FS_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image, void *_udata, hbool_t UNUSED *dirty) { H5FS_t *fspace = NULL; /* Free space header info */ @@ -267,9 +267,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5FS_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, - haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, - unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, +H5FS_cache_hdr_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, + haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, + unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5FS_t *fspace = (H5FS_t *)_thing; /* Pointer to free space header */ @@ -396,7 +396,7 @@ H5FS_cache_hdr_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) *------------------------------------------------------------------------- */ static void * -H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len, +H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image, void *_udata, hbool_t UNUSED *dirty) { H5FS_sinfo_t *sinfo = NULL; /* Free space section info */ @@ -417,7 +417,7 @@ H5FS_cache_sinfo_deserialize(haddr_t UNUSED addr, size_t UNUSED len, /* Allocate a new free space section info */ if(NULL == (sinfo = H5FS_sinfo_new(udata->f, udata->fspace))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") - + /* Link free space manager to section info */ /* (for deserializing sections) */ HDassert(udata->fspace->sinfo == NULL); @@ -660,8 +660,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5FS_cache_sinfo_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5FS_cache_sinfo_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5FS_sinfo_t * sinfo = (H5FS_sinfo_t *)_thing; diff --git a/src/H5FSsection.c b/src/H5FSsection.c index 6e1618f..aa6d71e 100644 --- a/src/H5FSsection.c +++ b/src/H5FSsection.c @@ -1790,7 +1790,7 @@ HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC /* Update current space used for free space sections */ if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk") - + /* Mark free space sections as dirty */ if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty") diff --git a/src/H5Fmount.c b/src/H5Fmount.c index b67021f..9dfdfb4 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -160,7 +160,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, * user from doing this. */ if(mp_loc.oloc->holding_file != FALSE) - HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files") + HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount path cannot contain links to external files") /* Open the mount point group */ if(NULL == (mount_point = H5G_open(&mp_loc, dxpl_id))) @@ -523,7 +523,7 @@ H5Funmount(hid_t loc_id, const char *name) /* Not sure that this will generate any dirty metadata. * - * Also, must decide how we are going to deal with journaling + * Also, must decide how we are going to deal with journaling * in such cases. */ FUNC_ENTER_API_META(H5Funmount, loc_id, H5AC_dxpl_id, FAIL) diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 354de3a..5d08eba 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -418,7 +418,7 @@ struct H5B_class_t; struct H5RC_t; /* Private functions */ -H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, +H5_DLL herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags); H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t dxpl_id); diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index aa87842..37a34a3 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -220,15 +220,15 @@ done: * * Purpose: Create a superblock extension for the superblock. * - * This method will be called either on superblock + * This method will be called either on superblock * initialization, or if journaling is enabled, and there - * is no superblock extension to put the journaling + * is no superblock extension to put the journaling * configuration data into. * * The code in this function was hacked from existing * code in H5F_super_init(). * - * The method should fail if a superblock extension + * The method should fail if a superblock extension * exists on entry. * * Return: Success: SUCCEED @@ -323,7 +323,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc) lf = shared->lf; /* initialize the metadata journaling configuration sections of the - * super block to indicate that journaling is not turned on at + * super block to indicate that journaling is not turned on at * present. These initialization may be overridden shortly. */ shared->mdc_jnl_enabled = FALSE; @@ -700,7 +700,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc) H5O_msg_reset(H5O_DRVINFO_ID, &drvinfo); } /* end else */ - /* Read in the metadata journaling configuration message, + /* Read in the metadata journaling configuration message, * if it exists. */ if(NULL == H5O_msg_read(&ext_loc, H5O_MDJ_MSG_ID, &mdj_msg, dxpl_id)) { @@ -843,19 +843,19 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id) f->shared->extension_ok = TRUE; need_ext = TRUE; } /* end if */ - /* If we're going to use a version of the superblock format which allows + /* If we're going to use a version of the superblock format which allows * for the superblock extension, check for non-default values to store * in it. */ else if(super_vers >= HDF5_SUPERBLOCK_VERSION_2) { - /* make note of the fact that we can construct a superblock + /* make note of the fact that we can construct a superblock * extension later if we wish. */ f->shared->extension_ok = TRUE; /* Check for non-default v1 B-tree 'K' values to store */ if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF || - f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || + f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) need_ext = TRUE; /* Check for driver info to store */ @@ -893,7 +893,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id) /* Check for non-default v1 B-tree 'K' values to store */ if(f->shared->btree_k[H5B_SNODE_ID] != HDF5_BTREE_SNODE_IK_DEF || - f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || + f->shared->btree_k[H5B_ISTORE_ID] != HDF5_BTREE_ISTORE_IK_DEF || f->shared->sym_leaf_k != H5F_CRT_SYM_LEAF_DEF) { H5O_btreek_t btreek; /* v1 B-tree 'K' value message for superblock extension */ @@ -929,19 +929,19 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id) * super block extension if it is. * * However, the cache has not been initialized at this point, - * so we don't know if we will be successful in creating the + * so we don't know if we will be successful in creating the * journal file (the journal file may already exist, or some - * directory on the journal path may not exist. + * directory on the journal path may not exist. * * Further, the cache should refuse to allow the file to open if * it detects journaling in progress -- so marking journaling in * progress here would introduce some complexities. - * status now + * status now * * Thus, don't write the metadata journaling message now. Instead, - * initialize the metadata journaling related fields to indicate + * initialize the metadata journaling related fields to indicate * that journaling is not in progress. If journaling is requested, - * we will write the metadata journaling message after we have + * we will write the metadata journaling message after we have * successfully opened the journal file and started journaling. * * JRM -- 2/19/09 @@ -1119,10 +1119,10 @@ done: * Function: H5F_super_write_mdj_msg * * If journaling is enabled, create a superblock extension - * if necessary and then write the current contents of - * the mdc_jnl_enabled, mdc_jnl_magic, mdc_jnl_file_name_lenand - * mdc_jnl_file_name fields of the shared structure to the - * mdj_msg in the superblock extention, overwriting the old + * if necessary and then write the current contents of + * the mdc_jnl_enabled, mdc_jnl_magic, mdc_jnl_file_name_lenand + * mdc_jnl_file_name fields of the shared structure to the + * mdj_msg in the superblock extention, overwriting the old * message if it exists. * * If journaling is not enabled, remove the old mdj message @@ -1170,18 +1170,18 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id) } /* end else */ /* The metadata journaling message is a variable length message. - * This raises the question of how to deal with any pre-existing + * This raises the question of how to deal with any pre-existing * message. * * While in theory we could try to re-size it, after looking through - * the code and talking to Quincey, it appears that the standard - * practice in such cases seems to be to delete the old message, + * the code and talking to Quincey, it appears that the standard + * practice in such cases seems to be to delete the old message, * and then replace it with a new message. * - * Add to this the fact that the metadata journaling message - * should not exist unless journaling is enabled (or to put it - * another way, the message should never appear in a valid HDF5 - * file). + * Add to this the fact that the metadata journaling message + * should not exist unless journaling is enabled (or to put it + * another way, the message should never appear in a valid HDF5 + * file). * * Thus, here we check to see if a metadata jouraling message exists, * and delete it if it does. If metadata data journaling is enabled, @@ -1190,8 +1190,8 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id) if((msg_exists = H5O_msg_exists(&ext_loc, H5O_MDJ_MSG_ID, dxpl_id)) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to determine if metadata journaling message exists?!?!") if(msg_exists == TRUE) { - /* metadata journaling message exists -- delete it from the - * super block extension now. We will replace it later if + /* metadata journaling message exists -- delete it from the + * super block extension now. We will replace it later if * metadata journaling is enabled. */ if(H5O_msg_remove(&ext_loc, H5O_MDJ_MSG_ID, H5O_ALL, FALSE, dxpl_id) < 0) @@ -1201,7 +1201,7 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id) if(f->shared->mdc_jnl_enabled) { H5O_mdj_msg_t mdj_msg; /* Metadata journaling message to insert in superblock extension */ - /* create a metadata journaling message and insert it in + /* create a metadata journaling message and insert it in * the superblock extension. */ mdj_msg.mdc_jnl_enabled = f->shared->mdc_jnl_enabled; @@ -1006,7 +1006,7 @@ H5G_create(H5F_t *file, hid_t gcpl_id, hid_t dxpl_id) /* Set the count of times the object is opened */ grp->shared->fo_count = 1; - + /* Set return value */ ret_value = grp; @@ -1767,7 +1767,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata) /* Build the link's relative path name */ HDassert(udata->path[old_path_len] == '\0'); - HDstrcpy(&(udata->path[old_path_len]), lnk->name); + HDstrcpy(&(udata->path[old_path_len]), lnk->name); udata->curr_path_len += link_name_len; /* Construct the link info from the link message */ @@ -1830,9 +1830,9 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata) /* Add the path separator to the current path */ HDassert(udata->path[udata->curr_path_len] == '\0'); - HDstrcpy(&(udata->path[udata->curr_path_len]), "/"); + HDstrcpy(&(udata->path[udata->curr_path_len]), "/"); udata->curr_path_len++; - + /* Attempt to get the link info for this group */ if(H5G_obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) { /* Check for creation order tracking, if creation order index lookup requested */ diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c index b0340a7..be423b5 100644 --- a/src/H5Gcompact.c +++ b/src/H5Gcompact.c @@ -406,7 +406,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, +H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data) { diff --git a/src/H5Glink.c b/src/H5Glink.c index 8122f6a..e632cad 100644 --- a/src/H5Glink.c +++ b/src/H5Glink.c @@ -263,7 +263,7 @@ H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap, /*------------------------------------------------------------------------- * Function: H5G_link_to_info * - * Purpose: Retrieve information from a link object + * Purpose: Retrieve information from a link object * * Return: Non-negative on success/Negative on failure * @@ -336,7 +336,7 @@ done: /*------------------------------------------------------------------------- * Function: H5G_link_to_loc * - * Purpose: Build group location from group and link object + * Purpose: Build group location from group and link object * * Return: Non-negative on success/Negative on failure * diff --git a/src/H5Gname.c b/src/H5Gname.c index c5fc2c1..e5cd00a 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -460,7 +460,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id, H5I_dec_ref(file); HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name") } /* end if */ - + /* Close file ID used for search */ if(H5I_dec_ref(file) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTCLOSEFILE, FAIL, "can't determine name") @@ -470,7 +470,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id, ret_value = len; } /* end if */ -done: +done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5G_get_name() */ @@ -914,7 +914,7 @@ done: */ herr_t H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file, - H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, + H5RS_str_t *src_full_path_r, H5F_t *dst_file, H5RS_str_t *dst_full_path_r, hid_t dxpl_id) { herr_t ret_value = SUCCEED; @@ -1086,8 +1086,8 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo, HGOTO_DONE(H5_ITER_STOP) } /* end if */ } /* end if */ - -done: + +done: if(obj_found && H5G_loc_free(&obj_loc) < 0) HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location") @@ -1137,7 +1137,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t * udata.lapl_id = lapl_id; udata.dxpl_id = dxpl_id; udata.path = NULL; - + /* Visit all the links in the file */ if((status = H5G_visit(file, "/", H5_INDEX_NAME, H5_ITER_NATIVE, H5G_get_name_by_addr_cb, &udata, lapl_id, dxpl_id)) < 0) HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group traversal failed while looking for object name") @@ -1166,8 +1166,8 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t * } /* end if */ else ret_value = 0; - -done: + +done: /* Release resources */ H5MM_xfree(udata.path); diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 6f796d5..b1426b7 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -77,7 +77,7 @@ static size_t H5G_node_size_real(const H5F_t *f); /* Metadata cache callbacks */ static void *H5G_node_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5G_node_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, +static herr_t H5G_node_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5G_node_free_icr(haddr_t addr, size_t len, void *thing); @@ -418,8 +418,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5G_node_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5G_node_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5G_node_t *sym = (H5G_node_t *)_thing; /* Pointer to the Symbol Table node */ diff --git a/src/H5Gobj.c b/src/H5Gobj.c index fbadab9..d79710e 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -182,7 +182,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, ginfo_size + (ginfo->est_num_entries * link_size); } /* end if */ - else + else hdr_size = 4 + 2 * H5F_SIZEOF_ADDR(f); /* @@ -326,7 +326,7 @@ H5O_linfo_t * H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id) { H5O_linfo_t *ret_value; /* Return value */ - + FUNC_ENTER_NOAPI(H5G_obj_get_linfo, NULL) /* check arguments */ diff --git a/src/H5Goh.c b/src/H5Goh.c index 3ccdf16..d1c824f 100644 --- a/src/H5Goh.c +++ b/src/H5Goh.c @@ -271,7 +271,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) HDassert(bh_info); /* Check for "new style" group info */ - if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) { + if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_LINFO_ID, &linfo)) { H5O_stab_t stab; /* Info about symbol table */ /* Must be "old style" group, clear error stack */ @@ -280,7 +280,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) /* Get symbol table message */ if(NULL == H5O_msg_read_real(f, dxpl_id, oh, H5O_STAB_ID, &stab)) HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages") - + /* Get symbol table size info */ if(H5G_stab_bh_size(f, dxpl_id, &stab, bh_info) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve symbol table size info") diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 5ba7050..5b8b054 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -86,7 +86,7 @@ H5_DLL herr_t H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_DLL herr_t H5Gclose(hid_t group_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Gstab.c b/src/H5Gstab.c index 2b1476d..856e2e8 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -651,7 +651,7 @@ done: /*------------------------------------------------------------------------- * Function: H5G_stab_get_name_by_idx_cb * - * Purpose: Callback for B-tree iteration 'by index' info query to + * Purpose: Callback for B-tree iteration 'by index' info query to * retrieve the name of a link * * Return: Success: Non-negative @@ -869,7 +869,7 @@ done: /*------------------------------------------------------------------------- * Function: H5G_stab_lookup_by_idx_cb * - * Purpose: Callback for B-tree iteration 'by index' info query to + * Purpose: Callback for B-tree iteration 'by index' info query to * retrieve the link * * Return: Success: Non-negative @@ -984,7 +984,7 @@ done: /*------------------------------------------------------------------------- * Function: H5G_stab_get_type_by_idx_cb * - * Purpose: Callback for B-tree iteration 'by index' info query to + * Purpose: Callback for B-tree iteration 'by index' info query to * retrieve the type of an object * * Return: Success: Non-negative diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c index dcc77c2..b473a97 100644 --- a/src/H5Gtraverse.c +++ b/src/H5Gtraverse.c @@ -422,7 +422,7 @@ H5G_traverse_mount(H5G_loc_t *obj_loc/*in,out*/) if(0 == cmp) { /* Get the child file */ child = parent->shared->mtab.child[md].file; - + /* Get the location for the root group in the child's file */ oloc = H5G_oloc(child->shared->root_grp); @@ -739,7 +739,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, linfo = &def_linfo; } /* end if */ else { - /* Only keep the creation order information from the parent + /* Only keep the creation order information from the parent * group's link info */ HDmemcpy(&tmp_linfo, &def_linfo, sizeof(H5O_linfo_t)); @@ -814,7 +814,7 @@ done: H5G_loc_free(&obj_loc); if(group_copy && !(own_loc & H5G_OWN_GRP_LOC)) H5G_loc_free(&grp_loc); - + /* If there's valid information in the link, reset it */ if(link_valid) H5O_msg_reset(H5O_LINK_ID, &lnk); @@ -644,7 +644,7 @@ done: * * Purpose: Perform an operation directly on a heap object * - * Note: The library routines currently assume that the 'op' callback + * Note: The library routines currently assume that the 'op' callback * won't modify the object. This can easily be changed later for * "managed" heap objects, and, with some difficulty, for 'huge' * and 'tiny' heap objects. diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index f57c408..4ceb0c2 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -431,7 +431,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, H5HF_dblock_cache_ud_t udata; /* parent and other infor for deserializing direct block */ size_t odi_size; /* On disk image size of the direct block. * Note that there is no necessary relation - * between this value, and the actual + * between this value, and the actual * direct block size, as conpression may * reduce the size of the on disk image, * and check sums may increase it. @@ -458,7 +458,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, /* set up the direct block size */ udata.dblock_size = dblock_size; - /* compute the on disk image size -- observe that odi_size and + /* compute the on disk image size -- observe that odi_size and * dblock_size will be identical if there is no filtering. */ if(hdr->filter_len > 0) { @@ -661,7 +661,7 @@ done: * *------------------------------------------------------------------------- */ -herr_t +herr_t H5HF_man_dblock_dest(H5HF_direct_t *dblock) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index 46e37cb..06ab19a 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -409,7 +409,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't finish phase #1 of header final initialization") /* Copy any I/O filter pipeline */ - /* (This code is not in the "finish init phase" routines because those + /* (This code is not in the "finish init phase" routines because those * routines are also called from the cache 'load' callback, and the filter * length is already set in that case (its stored in the header on disk)) */ @@ -439,7 +439,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam) hdr->heap_size = H5HF_HEADER_SIZE(hdr); /* Set the length of IDs in the heap */ - /* (This code is not in the "finish init phase" routines because those + /* (This code is not in the "finish init phase" routines because those * routines are also called from the cache 'load' callback, and the ID * length is already set in that case (its stored in the header on disk)) */ @@ -1188,7 +1188,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr) /* (Skip direct block that will be deleted, if we find it) */ tmp_entry = curr_entry; while(tmp_entry >= 0 && - (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) || + (H5F_addr_eq(iblock->ents[tmp_entry].addr, dblock_addr) || !H5F_addr_defined(iblock->ents[tmp_entry].addr))) tmp_entry--; /* Check for no earlier blocks in this indirect block */ diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index 391ff3c..defda1f 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -125,7 +125,7 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock) /* Sanity check */ HDassert(par_iblock->child_iblocks); - HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows + HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width)); /* Compute index in parent's child iblock pointer array */ @@ -179,7 +179,7 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock) /* Sanity check */ HDassert(par_iblock->child_iblocks); - HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows + HDassert(iblock->par_entry >= (iblock->hdr->man_dtable.max_direct_rows * iblock->hdr->man_dtable.cparam.width)); /* Compute index in parent's child iblock pointer array */ @@ -1086,7 +1086,7 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr, /* Sanity check */ HDassert(par_iblock->child_iblocks); - HDassert(par_entry >= (hdr->man_dtable.max_direct_rows + HDassert(par_entry >= (hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width)); /* Compute index in parent's child iblock pointer array */ @@ -1438,7 +1438,7 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr, /* Are we in a direct or indirect block row */ if(row < hdr->man_dtable.max_direct_rows) { hsize_t dblock_size; /* Size of direct block on disk */ - + /* Check for I/O filters on this heap */ if(hdr->filter_len > 0) dblock_size = iblock->filt_ents[entry].size; @@ -1537,7 +1537,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad entry = hdr->man_dtable.max_direct_rows * hdr->man_dtable.cparam.width; first_row_bits = H5V_log2_of2((uint32_t)hdr->man_dtable.cparam.start_block_size) + H5V_log2_of2(hdr->man_dtable.cparam.width); - num_indirect_rows = + num_indirect_rows = (H5V_log2_gen(hdr->man_dtable.row_block_size[hdr->man_dtable.max_direct_rows]) - first_row_bits) + 1; for(u = hdr->man_dtable.max_direct_rows; u < iblock->nrows; u++, num_indirect_rows++) { size_t v; /* Local index variable */ diff --git a/src/H5HFman.c b/src/H5HFman.c index 29d3d4a..09b13ec 100644 --- a/src/H5HFman.c +++ b/src/H5HFman.c @@ -209,7 +209,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, +H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, H5HF_operator_t op, void *op_data, unsigned op_flags) { H5HF_direct_t *dblock = NULL; /* Pointer to direct block to query */ diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h index 55c601e..b92a372 100644 --- a/src/H5HFpkg.h +++ b/src/H5HFpkg.h @@ -552,12 +552,12 @@ typedef struct H5HF_dblock_cache_ud_t { H5HF_parent_t par_info; /* Parent info */ H5F_t * f; /* File pointer */ size_t dblock_size; /* size of the direct block, which bears - * no necessary relation to the block - * odi_size -- the size of the on disk - * image of the block. Note that the + * no necessary relation to the block + * odi_size -- the size of the on disk + * image of the block. Note that the * metadata cache is only interested - * in the odi_size, and thus it is this - * value that is passed to the cache in + * in the odi_size, and thus it is this + * value that is passed to the cache in * calls to it. */ unsigned filter_mask; /* Excluded filters for direct block */ diff --git a/src/H5HFsection.c b/src/H5HFsection.c index 9587fe0..fd75a3b 100644 --- a/src/H5HFsection.c +++ b/src/H5HFsection.c @@ -1138,7 +1138,7 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void UNUSED *_udata) /* Protect the direct block for the section */ /* (should be a root direct block) */ HDassert(dblock_addr == hdr->man_dtable.table_addr); - if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, + if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC2_WRITE))) HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block") HDassert(H5F_addr_eq(dblock->block_off + dblock_size, (*sect)->sect_info.addr + (*sect)->sect_info.size)); @@ -2306,7 +2306,7 @@ H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size, /* Set the 'indirect' specific fields */ if(iblock) { sect->u.indirect.u.iblock = iblock; - sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * + sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows; if(H5HF_iblock_incr(sect->u.indirect.u.iblock) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment reference count on shared indirect block") @@ -2361,7 +2361,7 @@ done: *------------------------------------------------------------------------- */ static H5HF_free_section_t * -H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, +H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, H5HF_free_section_t *row_sect) { H5HF_free_section_t *sect = NULL; /* 'Indirect' free space section to add */ @@ -2378,7 +2378,7 @@ H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, HDassert(row_sect->u.row.row < hdr->man_dtable.max_direct_rows); /* Create free space section node */ - if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr, + if(NULL == (sect = H5HF_sect_indirect_new(hdr, row_sect->sect_info.addr, row_sect->sect_info.size, iblock, iblock->block_off, row_sect->u.row.row, row_sect->u.row.col, row_sect->u.row.num_entries))) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, NULL, "can't create indirect section") @@ -2647,7 +2647,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id, sect->u.indirect.dir_nrows = dir_nrows; /* Make certain we've tracked the section's dependents correctly */ - HDassert(sect->u.indirect.rc == + HDassert(sect->u.indirect.rc == (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows)); done: @@ -2827,7 +2827,7 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_ sect->u.indirect.u.iblock = sec_iblock; /* Set the number of entries in the indirect block */ - sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * + sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows; /* Unlock indirect block */ @@ -2890,7 +2890,7 @@ H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, sect->u.indirect.u.iblock = sect_iblock; /* Set the number of entries in the indirect block */ - sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * + sect->u.indirect.iblock_entries = hdr->man_dtable.cparam.width * sect->u.indirect.u.iblock->max_rows; /* Section is "live" now */ @@ -3114,10 +3114,10 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_ /* Transfer row sections between current & peer sections */ HDmemcpy(&peer_sect->u.indirect.dir_rows[0], - §->u.indirect.dir_rows[0], + §->u.indirect.dir_rows[0], (sizeof(H5HF_free_section_t *) * peer_dir_nrows)); - HDmemmove(§->u.indirect.dir_rows[0], - §->u.indirect.dir_rows[peer_dir_nrows], + HDmemmove(§->u.indirect.dir_rows[0], + §->u.indirect.dir_rows[peer_dir_nrows], (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows))); sect->u.indirect.dir_nrows -= peer_dir_nrows; HDassert(row_sect == sect->u.indirect.dir_rows[0]); @@ -3149,9 +3149,9 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_ sect->u.indirect.num_entries -= (peer_nentries + 1); /* Transferred entries, plus the entry allocated out of the row */ /* Make certain we've tracked the sections' dependents correctly */ - HDassert(sect->u.indirect.rc == + HDassert(sect->u.indirect.rc == (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows)); - HDassert(peer_sect->u.indirect.rc == + HDassert(peer_sect->u.indirect.rc == (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows)); } /* end else */ } /* end if */ @@ -3342,7 +3342,7 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s /* Transfer child indirect sections between current & peer sections */ HDmemcpy(&peer_sect->u.indirect.indir_ents[0], - §->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries], + §->u.indirect.indir_ents[sect->u.indirect.indir_nents - peer_nentries], (sizeof(H5HF_free_section_t *) * peer_nentries)); sect->u.indirect.indir_nents -= (peer_nentries + 1); /* Transferred blocks, plus child entry */ @@ -3369,9 +3369,9 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s /* (Note modified on current section's ref. count, since we haven't * detached the child section yet) */ - HDassert((sect->u.indirect.rc - 1) == + HDassert((sect->u.indirect.rc - 1) == (sect->u.indirect.indir_nents + sect->u.indirect.dir_nrows)); - HDassert(peer_sect->u.indirect.rc == + HDassert(peer_sect->u.indirect.rc == (peer_sect->u.indirect.indir_nents + peer_sect->u.indirect.dir_nrows)); } /* end else */ } /* end if */ @@ -3649,8 +3649,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, sect1->u.indirect.dir_rows = new_dir_rows; /* Transfer the second section's rows to first section */ - HDmemcpy(§1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows], - §2->u.indirect.dir_rows[src_row2], + HDmemcpy(§1->u.indirect.dir_rows[sect1->u.indirect.dir_nrows], + §2->u.indirect.dir_rows[src_row2], (sizeof(H5HF_free_section_t *) * nrows_moved2)); /* Re-target the row sections moved from second section */ @@ -3695,8 +3695,8 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, sect1->u.indirect.indir_ents = new_indir_ents; /* Transfer the second section's entries to first section */ - HDmemcpy(§1->u.indirect.indir_ents[sect1->u.indirect.indir_nents], - §2->u.indirect.indir_ents[0], + HDmemcpy(§1->u.indirect.indir_ents[sect1->u.indirect.indir_nents], + §2->u.indirect.indir_ents[0], (sizeof(H5HF_free_section_t *) * sect2->u.indirect.indir_nents)); } /* end else */ @@ -3717,7 +3717,7 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id, sect1->u.indirect.span_size += sect2->u.indirect.span_size; /* Make certain we've tracked the first section's dependents correctly */ - HDassert(sect1->u.indirect.rc == + HDassert(sect1->u.indirect.rc == (sect1->u.indirect.indir_nents + sect1->u.indirect.dir_nrows)); /* Wrap up, freeing or re-inserting second row section */ @@ -3807,7 +3807,7 @@ H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect) HDassert(par_iblock); /* Create parent indirect section */ - if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, + if(NULL == (par_sect = H5HF_sect_indirect_new(hdr, sect->sect_info.addr, sect->sect_info.size, par_iblock, par_iblock->block_off, par_row, par_col, 1))) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't create indirect section") @@ -3965,7 +3965,7 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id, unsigned *des_flags) { H5HF_free_section_t *new_sect; /* New indirect section */ - hsize_t iblock_off; /* Indirect block's offset */ + hsize_t iblock_off; /* Indirect block's offset */ unsigned start_row; /* Indirect section's start row */ unsigned start_col; /* Indirect section's start column */ unsigned nentries; /* Indirect section's number of entries */ diff --git a/src/H5HFstat.c b/src/H5HFstat.c index d151b47..8d6b2ba 100644 --- a/src/H5HFstat.c +++ b/src/H5HFstat.c @@ -112,7 +112,7 @@ H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats) * Function: H5HF_size * * Purpose: Retrieve storage info for: - * 1. fractal heap + * 1. fractal heap * 2. btree storage used by huge objects in fractal heap * 3. free space storage info * diff --git a/src/H5HGcache.c b/src/H5HGcache.c index 769e9d9..8db1626 100755 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -62,7 +62,7 @@ /********************/ /* Metadata cache callbacks */ -static void *H5HG_deserialize(haddr_t addr, size_t len, const void *image, +static void *H5HG_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5HG_image_len(const void *thing, size_t *image_len_ptr); static herr_t H5HG_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, @@ -159,7 +159,7 @@ H5HG_deserialize(haddr_t addr, size_t UNUSED len, const void *image, /* Allocate space for the heap->chunk */ if(NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, (size_t)heap->size))) HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed") - + /* Copy image into chunk */ HDmemcpy(heap->chunk, image, heap->size); @@ -270,7 +270,7 @@ H5HG_deserialize(haddr_t addr, size_t UNUSED len, const void *image, f->shared->cwfs[0] = heap; } /* end else */ - /* Sanity check */ + /* Sanity check */ HDassert((size_t)((const uint8_t *)p - (const uint8_t *)heap->chunk) <= len); } /* end if heap->size <= len */ @@ -317,7 +317,7 @@ H5HG_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, if(heap->size > len) { /* free old image buffer */ H5MM_free(image); - + /* allocate new image buffer */ if(NULL == (*new_image = H5MM_malloc(heap->size))) HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "new image null after H5MM_realloc()\n") @@ -347,7 +347,7 @@ done: /*------------------------------------------------------------------------- * Function: H5HG_image_len * - * Purpose: Tell the metadata cache about the actual size + * Purpose: Tell the metadata cache about the actual size * of the global heap * * Return: Non-negative on success/Negative on failure @@ -362,13 +362,13 @@ static herr_t H5HG_image_len(const void *thing, size_t *image_len_ptr) { const H5HG_heap_t *heap = (const H5HG_heap_t *)thing; /* Global heap */ - + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_image_len) /* Check arguments */ HDassert(heap); HDassert(image_len_ptr); - + /* Report the global heap's total size */ *image_len_ptr = heap->size; diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h index 48c2633..0e34d57 100644 --- a/src/H5HGpkg.h +++ b/src/H5HGpkg.h @@ -36,7 +36,7 @@ #include "H5FLprivate.h" /* Free lists */ #define H5F_PACKAGE -#include "H5Fpkg.h" +#include "H5Fpkg.h" /*****************************/ /* Package Private Variables */ diff --git a/src/H5HLcache.c b/src/H5HLcache.c index e0d6930..cf5668f 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -65,7 +65,7 @@ /********************/ /* Metadata cache callbacks */ -static void *H5HL_prfx_deserialize(haddr_t addr, size_t len, const void *image, +static void *H5HL_prfx_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5HL_prfx_image_len(const void *thing, size_t *image_len_ptr); static herr_t H5HL_prfx_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, @@ -73,7 +73,7 @@ static herr_t H5HL_prfx_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, s size_t *new_len, void **new_image); static herr_t H5HL_prfx_free_icr(haddr_t addr, size_t len, void *thing); -static void *H5HL_dblk_deserialize(haddr_t addr, size_t len, const void *image, +static void *H5HL_dblk_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5HL_dblk_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, @@ -409,8 +409,8 @@ H5HL_prfx_image_len(const void *thing, size_t *image_len_ptr) *------------------------------------------------------------------------- */ static herr_t -H5HL_prfx_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5HL_prfx_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5HL_prfx_t *prfx = (H5HL_prfx_t *)_thing; /* Pointer to the local heap prefix */ @@ -572,8 +572,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5HL_dblk_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5HL_dblk_serialize(const H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ @@ -152,7 +152,7 @@ static herr_t H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk, H5G_loc_t *obj_loc, void *_udata/*in,out*/, H5G_own_loc_t *own_loc/*out*/); static herr_t H5L_create_real(const H5G_loc_t *link_loc, const char *link_name, - H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, + H5G_name_t *obj_path, H5F_t *obj_file, H5O_link_t *lnk, H5O_obj_create_t *ocrt_info, hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id); static herr_t H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size); static herr_t H5L_get_val_cb(H5G_loc_t *grp_loc/*in*/, const char *name, @@ -346,7 +346,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link") -done: +done: FUNC_LEAVE_API_META(ret_value) } /* end H5Lmove() */ @@ -404,7 +404,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link") -done: +done: FUNC_LEAVE_API_META(ret_value) } /* end H5Lcopy() */ @@ -1587,7 +1587,7 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc, lnk.u.hard.addr = obj_loc->oloc->addr; /* Create the link */ - if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0) + if(H5L_create_real(new_loc, new_name, obj_loc->path, obj_loc->oloc->file, &lnk, NULL, lcpl_id, lapl_id, dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object") done: @@ -1630,7 +1630,7 @@ H5L_link_object(const H5G_loc_t *new_loc, const char *new_name, lnk.type = H5L_TYPE_HARD; /* Create the link */ - if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0) + if(H5L_create_real(new_loc, new_name, NULL, NULL, &lnk, ocrt_info, lcpl_id, lapl_id, dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create new link to object") done: @@ -2049,7 +2049,7 @@ done: /*------------------------------------------------------------------------- * Function: H5L_get_val_real * - * Purpose: Retrieve link value from a link object + * Purpose: Retrieve link value from a link object * * Return: Non-negative on success/Negative on failure * @@ -2081,7 +2081,7 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size) else if(lnk->type >= H5L_TYPE_UD_MIN) { const H5L_class_t *link_class; /* User-defined link class */ - /* Get the link class for this type of link. It's okay if the class + /* Get the link class for this type of link. It's okay if the class * isn't registered, though--we just can't give any more information * about it */ @@ -2672,7 +2672,7 @@ H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc, /* Do the move */ if(H5G_traverse(src_loc, src_name, target_flags, H5L_move_cb, &udata, lapl_id, dxpl_id) < 0) - HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link") + HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to find link") done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index d5b8b96..bde987c 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -170,7 +170,7 @@ done: * Monday, July 10, 2006 * Modifications: * Vailin Choi, April 2, 2008 - * Add handling to search for the target file + * Add handling to search for the target file * See description in RM: H5Lcreate_external * *------------------------------------------------------------------------- @@ -270,7 +270,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group, HDstrcpy(tempname, &file_name[2]); } } - + /* try searching from paths set in the environment variable */ if ((ext_file == NULL) && (env_prefix=HDgetenv("HDF5_EXT_PREFIX"))) { @@ -296,7 +296,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group, if (pp) H5MM_xfree(pp); } - + /* try searching from property list */ if (ext_file == NULL) { if(H5P_get(plist, H5L_ACS_ELINK_PREFIX_NAME, &my_prefix) < 0) diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 823b046..eba09b2 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -60,7 +60,7 @@ extern "C" { * defined by HDF5 but their behavior can be overridden by users. * Users who want to create new classes of links should contact the HDF5 * development team at hdfhelp@ncsa.uiuc.edu . - * These values can never change because they appear in HDF5 files. + * These values can never change because they appear in HDF5 files. */ typedef enum { H5L_TYPE_ERROR = (-1), /* Invalid link type id */ @@ -352,7 +352,7 @@ done: * H5Odecr_refcount() should be used when the object is * no longer being referenced by address (e.g. when the UD link * is deleted). - * + * * The address of the HDF5 file on disk has no effect on * H5Oopen_by_addr(), nor does the use of any unusual file * drivers. The "address" is really the offset within the @@ -1227,7 +1227,7 @@ done: * Modification: * Raymond Lu * 5 November 2007 - * Turn off the holding file variable if it's on. When it's + * Turn off the holding file variable if it's on. When it's * needed, the caller will turn it on again. *------------------------------------------------------------------------- */ @@ -1750,7 +1750,7 @@ done: /*------------------------------------------------------------------------- * Function: H5O_pin * - * Purpose: Wrapper around H5AC2_pin_entry + * Purpose: Wrapper around H5AC2_pin_entry * * Return: Success: Non-negative * Failure: Negative @@ -1784,7 +1784,7 @@ done: /*------------------------------------------------------------------------- * Function: H5O_unpin * - * Purpose: Wrapper around H5AC2_unpin_entry + * Purpose: Wrapper around H5AC2_unpin_entry * * Return: Success: Non-negative * Failure: Negative @@ -3093,7 +3093,7 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type, udata.dxpl_id = dxpl_id; udata.op = op; udata.op_data = op_data; - + /* Create skip list to store visited object information */ if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, 0.5, (size_t)16)) == NULL) HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects") diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 0eb6a20..3680cb7 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -154,7 +154,7 @@ H5O_add_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, unsigned idx, oh->mesg[u].raw -= new_gap_size; /* Slide raw message info forward in chunk image */ - HDmemmove(new_gap_loc, new_gap_loc + new_gap_size, + HDmemmove(new_gap_loc, new_gap_loc + new_gap_size, (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - (new_gap_loc + new_gap_size))); /* Add existing gap size to new gap size */ @@ -935,7 +935,7 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size) if(H5O_alloc_msgs(oh, (size_t)3) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, UFAIL, "can't allocate more space for messages") - /* Move message (that will be replaced with continuation message) + /* Move message (that will be replaced with continuation message) * to new chunk, if necessary. */ if(found_null < 0) { @@ -1191,7 +1191,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg, /* Check if chunk has a gap currently */ if(oh->chunk[mesg->chunkno].gap) { /* Eliminate the gap in the chunk */ - if(H5O_eliminate_gap(f, dxpl_id, oh, mesg, + if(H5O_eliminate_gap(f, dxpl_id, oh, mesg, ((oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)), oh->chunk[mesg->chunkno].gap) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk") @@ -1250,7 +1250,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh) /* Check if null message is not last in chunk */ chunk = &(oh->chunk[curr_msg->chunkno]); - if((curr_msg->raw + curr_msg->raw_size) + if((curr_msg->raw + curr_msg->raw_size) != ((chunk->image + chunk->size) - (H5O_SIZEOF_CHKSUM_OH(oh) + chunk->gap))) { H5O_mesg_t *nonnull_msg; /* Pointer to current message to operate on */ unsigned v; /* Local index variable */ @@ -1353,7 +1353,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh) /* Check for gap in null message's chunk */ if(oh->chunk[old_chunkno].gap > 0) { /* Eliminate the gap in the chunk */ - if(H5O_eliminate_gap(f, dxpl_id, oh, null_msg, + if(H5O_eliminate_gap(f, dxpl_id, oh, null_msg, ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)), oh->chunk[old_chunkno].gap) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk") @@ -1425,7 +1425,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh) /* Check for gap in new null message's chunk */ if(oh->chunk[old_chunkno].gap > 0) { /* Eliminate the gap in the chunk */ - if(H5O_eliminate_gap(f, dxpl_id, oh, &oh->mesg[new_null_msg], + if(H5O_eliminate_gap(f, dxpl_id, oh, &oh->mesg[new_null_msg], ((oh->chunk[old_chunkno].image + oh->chunk[old_chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[old_chunkno].gap)), oh->chunk[old_chunkno].gap) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTREMOVE, FAIL, "can't eliminate gap in chunk") diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 4bfeb3d..d1a5261 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -229,7 +229,7 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags, /* Indicate that the fill values aren't to be written out */ attr->shared->initialized = 1; - /* Increment the reference count for this object header message in cache(compact + /* Increment the reference count for this object header message in cache(compact storage) or for the object from dense storage. */ attr->shared->nrefs++; @@ -459,9 +459,9 @@ H5O_attr_size(const H5F_t UNUSED *f, const void *_mesg) * Modification:Raymond Lu * 25 June 2008 * Made this function empty. The freeing action is actually - * done in H5O_attr_free (see H5O_msg_free_real). But this - * empty reset function needs to be here. Otherwise, the - * caller function H5O_msg_reset_real will zero-set the whole + * done in H5O_attr_free (see H5O_msg_free_real). But this + * empty reset function needs to be here. Otherwise, the + * caller function H5O_msg_reset_real will zero-set the whole * message. *------------------------------------------------------------------------- */ @@ -675,10 +675,10 @@ H5O_attr_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *mesg_ty H5O_loc_reset(&(attr_dst->shared->oloc)); H5G_name_reset(&(attr_dst->path)); attr_dst->obj_opened = FALSE; - + /* Reference count for the header message in the cache */ attr_dst->shared->nrefs = 1; - + /* Copy attribute's name */ attr_dst->shared->name = H5MM_strdup(attr_src->shared->name); HDassert(attr_dst->shared->name); diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c index eb2e5a9..244dd5e 100644 --- a/src/H5Oattribute.c +++ b/src/H5Oattribute.c @@ -138,7 +138,7 @@ typedef struct { static herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *attr_op, void *op_data); -static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, +static htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char* name_to_open); /*********************/ @@ -353,10 +353,10 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr) HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "unable to create new attribute in header") } /* end else */ - /* Increment reference count for shared attribute object for the + /* Increment reference count for shared attribute object for the * object handle created by the caller function H5A_create. The count * for the cached object header has been incremented in the step above - * (in H5O_msg_append_real). The dense storage doesn't need a count. */ + * (in H5O_msg_append_real). The dense storage doesn't need a count. */ attr->shared->nrefs += 1; /* Was new attribute shared? */ @@ -469,7 +469,7 @@ done: * * Modification:Raymond Lu * 23 June 2008 - * If the attribute is in dense storage and has already been + * If the attribute is in dense storage and has already been * opened, make a copy of already opened object to share some * object information. *------------------------------------------------------------------------- @@ -633,11 +633,11 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type, /* Find out whether it has already been opened. If it has, close the object * and make a copy of the already opened object to share the object info. */ if(ret_value) { - if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, + if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, ret_value->shared->name)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, NULL, "failed in finding opened attribute") - /* If found that the attribute is already opened, make a copy of it + /* If found that the attribute is already opened, make a copy of it and close the object just opened. */ if(found_open_attr && exist_attr) { if(H5A_close(ret_value) < 0) @@ -663,7 +663,7 @@ done: * the name. Return the pointer to the object if found. * * Return: TRUE: found the already opened object - * FALSE: didn't find the opened object + * FALSE: didn't find the opened object * FAIL: function failed. * * Programmer: Raymond Lu @@ -691,7 +691,7 @@ htri_t H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char* HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "can't get number of opened attributes") /* Find out whether the attribute has been opened */ - if(num_open_attr) { + if(num_open_attr) { attr_id_list = (hid_t*)H5MM_malloc(num_open_attr*sizeof(hid_t)); /* Retrieve the IDs of all opened attributes */ @@ -815,7 +815,7 @@ done: * Modification:Raymond Lu * 4 June 2008 * Took out the data copying part because the attribute data - * is shared between attribute handle and object header. + * is shared between attribute handle and object header. *------------------------------------------------------------------------- */ static herr_t @@ -1082,7 +1082,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, old_version != ((H5A_t *)mesg->native)->shared->version) { H5A_t *attr; /* Attribute to re-add */ - /* Take ownership of the message's native info (the attribute) + /* Take ownership of the message's native info (the attribute) * so any shared objects in the file aren't adjusted (and * possibly deleted) when the message is released. */ @@ -1365,9 +1365,9 @@ done: * * Modification:Raymond Lu * 24 June 2008 - * When converting storage from dense to compact, if found - * the attribute is already opened, use the opened message - * to insert. If not, still use the message in the attribute + * When converting storage from dense to compact, if found + * the attribute is already opened, use the opened message + * to insert. If not, still use the message in the attribute * table. This will guarantee that the attribute message is * shared between the object in metadata cache and the opened * object. @@ -1432,14 +1432,14 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo, (atable.attrs[u])->sh_loc.type = H5O_SHARE_TYPE_UNSHARED; } /* end else */ - /* Insert attribute message into object header (Will increment + /* Insert attribute message into object header (Will increment reference count on shared attributes) */ /* Find out whether the attribute has been opened */ if((found_open_attr = H5O_attr_find_opened_attr(loc, &exist_attr, (atable.attrs[u])->shared->name)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "failed in finding opened attribute") /* If found the attribute is already opened, use the opened message to insert. - If not, still use the message in the attribute table. */ + If not, still use the message in the attribute table. */ if(found_open_attr && exist_attr) { if(H5O_msg_append_real(loc->file, dxpl_id, oh, H5O_MSG_ATTR, 0, 0, exist_attr) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't create message") diff --git a/src/H5Ocache.c b/src/H5Ocache.c index 8370394..f6b5cbb 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -63,7 +63,7 @@ static void *H5O_cache_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5O_cache_image_len(const void *thing, size_t *image_len_ptr); -static herr_t H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, +static herr_t H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5O_cache_free_icr(haddr_t addr, size_t len, void *thing); @@ -71,7 +71,7 @@ static herr_t H5O_cache_free_icr(haddr_t addr, size_t len, void *thing); static void *H5O_cache_chk_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); static herr_t H5O_cache_chk_serialize(const H5F_t *f, hid_t dxpl_id, - haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, + haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5O_cache_chk_free_icr(haddr_t addr, size_t len, void *thing); @@ -81,7 +81,7 @@ static herr_t H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chunk_proxy); /* Chunk routines */ static herr_t H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image, H5O_common_cache_ud_t *udata, hbool_t *dirty); -static herr_t H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno, +static herr_t H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno, uint8_t *image); /* Misc. routines */ @@ -362,8 +362,8 @@ H5O_cache_image_len(const void *thing, size_t *image_len_ptr) *------------------------------------------------------------------------- */ static herr_t -H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5O_cache_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5O_t *oh = (H5O_t *)_thing; /* Pointer to the object header */ @@ -604,9 +604,9 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5O_cache_chk_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, - haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, - unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, +H5O_cache_chk_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, + haddr_t UNUSED addr, size_t UNUSED len, void *image, void *_thing, + unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5O_chunk_proxy_t *chk_proxy = (H5O_chunk_proxy_t *)_thing; /* Pointer to the object header chunk proxy */ diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 55b38db..0aac469 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -100,11 +100,11 @@ H5FL_DEFINE(H5O_addr_map_t); * Purpose: Copy an object (group or dataset) to destination location * within a file or cross files. PLIST_ID is a property list * which is used to pass user options and properties to the - * copy. The name, dst_name, must not already be taken by some + * copy. The name, dst_name, must not already be taken by some * other object in the destination group. * * H5Ocopy() will fail if the name of the destination object - * exists in the destination group. For example, + * exists in the destination group. For example, * H5Ocopy(fid_src, "/dset", fid_dst, "/dset", ...) * will fail if "/dset" exists in the destination file * @@ -114,21 +114,21 @@ H5FL_DEFINE(H5O_addr_map_t); * the group are copied. Otherwise (default), it will * recursively copy all objects below the group * H5O_COPY_EXPAND_SOFT_LINK_FLAG - * If this flag is specified, it will copy the objects - * pointed by the soft links. Otherwise (default), it + * If this flag is specified, it will copy the objects + * pointed by the soft links. Otherwise (default), it * will copy the soft link as they are * H5O_COPY_WITHOUT_ATTR_FLAG - * If this flag is specified, it will copy object without + * If this flag is specified, it will copy object without * copying attributes. Otherwise (default), it will * copy object along with all its attributes * H5O_COPY_EXPAND_REFERENCE_FLAG * 1) Copy object between two different files: - * When this flag is specified, it will copy objects that + * When this flag is specified, it will copy objects that * are pointed by the references and update the values of * references in the destination file. Otherwise (default) * the values of references in the destination will set to * zero - * The current implementation does not handle references + * The current implementation does not handle references * inside of other datatype structure. For example, if * a member of compound datatype is reference, H5Ocopy() * will copy that field as it is. It will not set the @@ -139,11 +139,11 @@ H5FL_DEFINE(H5O_addr_map_t); * Datasets or attributes of references are copied as they * are, i.e. values of references of the destination object * are the same as the values of the source object - * + * * OPTIONS THAT MAY APPLY TO COPY IN THE FUTURE. * H5O_COPY_EXPAND_EXT_LINK_FLAG * If this flag is specified, it will expand the external links - * into new objects, Otherwise (default), it will keep external + * into new objects, Otherwise (default), it will keep external * links as they are (default) * * PROPERTIES THAT MAY APPLY TO COPY IN FUTURE @@ -473,7 +473,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, /* Copy the source message */ recompute_size = FALSE; - if((mesg_dst->native = H5O_msg_copy_file(copy_type, + if((mesg_dst->native = H5O_msg_copy_file(copy_type, oloc_src->file, mesg_src->native, oloc_dst->file, &recompute_size, cpy_info, udata, dxpl_id)) == NULL) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object header message") @@ -592,7 +592,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, * header. This will be written when the header is flushed to disk. */ if(oh_dst->version > H5O_VERSION_1) - HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC); + HDmemcpy(current_pos, H5O_HDR_MAGIC, (size_t)H5O_SIZEOF_MAGIC); current_pos += H5O_SIZEOF_HDR(oh_dst) - H5O_SIZEOF_CHKSUM_OH(oh_dst); /* Loop through destination messages, updating their "raw" info */ @@ -997,8 +997,8 @@ done: * * Return: Non-negative on success/Negative on failure * - * Programmer: Peter Cao - * Aug 7 2006 + * Programmer: Peter Cao + * Aug 7 2006 * *------------------------------------------------------------------------- */ @@ -1053,8 +1053,8 @@ done: * * Return: Non-negative on success/Negative on failure * - * Programmer: Peter Cao - * Aug 7 2006 + * Programmer: Peter Cao + * Aug 7 2006 * *------------------------------------------------------------------------- */ @@ -1120,7 +1120,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id, uint8_t *buf; /* Buffer to store serialized selection in */ H5HG_t hobjid; /* Heap object ID */ size_t buf_size; /* Length of object in heap */ - + /* Making equivalent references in the destination file */ for(i = 0; i < ref_count; i++) { /* Get the heap ID for the dataset region */ diff --git a/src/H5Odtype.c b/src/H5Odtype.c index ba343bc..a39d7cc 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -60,7 +60,7 @@ static herr_t H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, #define H5O_SHARED_COPY_FILE H5O_dtype_shared_copy_file #define H5O_SHARED_COPY_FILE_REAL H5O_dtype_copy_file #define H5O_SHARED_POST_COPY_FILE H5O_dtype_shared_post_copy_file -#undef H5O_SHARED_POST_COPY_FILE_REAL +#undef H5O_SHARED_POST_COPY_FILE_REAL #define H5O_SHARED_DEBUG H5O_dtype_shared_debug #define H5O_SHARED_DEBUG_REAL H5O_dtype_debug #include "H5Oshared.h" /* Shared Object Header Message Callbacks */ @@ -1131,7 +1131,7 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg) ret_value += offset_nbytes; /*member offset*/ if(dt->shared->version >= H5O_DTYPE_VERSION_2) ret_value += 4; /*member offset*/ - else + else ret_value += 4 + /*member offset*/ 1 + /*dimensionality*/ 3 + /*reserved*/ @@ -1295,7 +1295,7 @@ done: * Function: H5O_dtype_can_share * * Purpose: Determines if this datatype is allowed to be shared or - * not. Immutable datatypes or datatypes that are already + * not. Immutable datatypes or datatypes that are already * shared cannot be shared (again). * * Return: TRUE if datatype can be shared @@ -1389,12 +1389,12 @@ done: /*------------------------------------------------------------------------- * Function: H5O_dtype_copy_file - * + * * Purpose: Copy a native datatype message from one file to another. * * Return: Success: Native copy of message * Failure: NULL - * + * * Programmer: James Laird * December 12, 2006 * diff --git a/src/H5Omdj_msg.c b/src/H5Omdj_msg.c index e63aafe..954f61f 100644 --- a/src/H5Omdj_msg.c +++ b/src/H5Omdj_msg.c @@ -28,8 +28,8 @@ * * Modifications: * - * Re-worked message to include the journal file name and - * magic, instead of simply containing a pointer to a + * Re-worked message to include the journal file name and + * magic, instead of simply containing a pointer to a * journal configuration block containing this data. * *------------------------------------------------------------------------- @@ -104,7 +104,7 @@ const H5O_msg_class_t H5O_MSG_MDJ_CONF[1] = {{ /*------------------------------------------------------------------------- * Function: H5O_mdj_msg_decode * - * Purpose: Decode a journaling configuration message and return a + * Purpose: Decode a journaling configuration message and return a * pointer to a newly allocated H5O_mdj_msg_t struct. * * Return: Success: Ptr to new message in native struct. @@ -117,8 +117,8 @@ const H5O_msg_class_t H5O_MSG_MDJ_CONF[1] = {{ */ static void * -H5O_mdj_msg_decode(H5F_t *f, - hid_t UNUSED dxpl_id, +H5O_mdj_msg_decode(H5F_t *f, + hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags, const uint8_t *p) { @@ -145,7 +145,7 @@ H5O_mdj_msg_decode(H5F_t *f, /* Allocate space for message */ - if ( NULL == + if ( NULL == (mesg = (H5O_mdj_msg_t *)H5MM_calloc(sizeof(H5O_mdj_msg_t))) ) { HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, \ @@ -186,8 +186,8 @@ H5O_mdj_msg_decode(H5F_t *f, /* copy out the journal file path -- check length in passing. * - * we could probably do this faster with a memcpy(), but this - * operation happens very infrequently, and doing it this way + * we could probably do this faster with a memcpy(), but this + * operation happens very infrequently, and doing it this way * adds a bit of sanity checking. */ i = 0; @@ -199,7 +199,7 @@ H5O_mdj_msg_decode(H5F_t *f, } while ( ( ch != '\0' ) && ( i <= path_len ) ); if ( ( ch != '\0' ) || ( i != path_len + 1 ) ) { - + HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, \ "bad path and/or path len") } @@ -228,9 +228,9 @@ done: */ static herr_t -H5O_mdj_msg_encode(H5F_t *f, - hbool_t UNUSED disable_shared, - uint8_t *p, +H5O_mdj_msg_encode(H5F_t *f, + hbool_t UNUSED disable_shared, + uint8_t *p, const void *_mesg) { const H5O_mdj_msg_t *mesg = (const H5O_mdj_msg_t *)_mesg; @@ -245,7 +245,7 @@ H5O_mdj_msg_encode(H5F_t *f, HDassert(f); HDassert(p); HDassert(mesg); - + if ( ( f == NULL ) || ( p == NULL ) || ( mesg == NULL ) ) { HGOTO_ERROR(H5E_SYSTEM, H5E_SYSERRSTR, FAIL, "Bad params on entry."); @@ -335,8 +335,8 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest) /* copy the journal file path -- check length in passing. * - * we could probably do this faster with a memcpy(), but this - * operation happens very infrequently, and doing it this way + * we could probably do this faster with a memcpy(), but this + * operation happens very infrequently, and doing it this way * adds a bit of sanity checking. */ if ( mesg->mdc_jnl_file_name_len == 0 ) { @@ -350,7 +350,7 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest) size_t path_len; path_len = mesg->mdc_jnl_file_name_len; - + do { ch = (mesg->mdc_jnl_file_name)[i]; @@ -359,7 +359,7 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest) } while ( ( ch != '\0' ) && ( i <= path_len ) ); if ( ( ch != '\0' ) || ( i != path_len + 1 ) ) { - + HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, NULL, \ "bad path and/or path len???") } @@ -390,8 +390,8 @@ done: *------------------------------------------------------------------------- */ static size_t -H5O_mdj_msg_size(const H5F_t *f, - hbool_t UNUSED disable_shared, +H5O_mdj_msg_size(const H5F_t *f, + hbool_t UNUSED disable_shared, const void *_mesg) { const H5O_mdj_msg_t * mesg = (const H5O_mdj_msg_t *)_mesg; @@ -459,11 +459,11 @@ H5O_mdj_msg_reset(void *_mesg) */ static herr_t -H5O_mdj_msg_debug(H5F_t UNUSED *f, - hid_t UNUSED dxpl_id, - const void *_mesg, +H5O_mdj_msg_debug(H5F_t UNUSED *f, + hid_t UNUSED dxpl_id, + const void *_mesg, FILE *stream, - int indent, + int indent, int fwidth) { const H5O_mdj_msg_t *mesg = (const H5O_mdj_msg_t *)_mesg; @@ -478,19 +478,19 @@ H5O_mdj_msg_debug(H5F_t UNUSED *f, HDassert(fwidth >= 0); HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, - "mdc_jnl_enabled:", + "mdc_jnl_enabled:", (int)(mesg->mdc_jnl_enabled)); HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, - "mdc_jnl_magic:", + "mdc_jnl_magic:", (int)(mesg->mdc_jnl_magic)); HDfprintf(stream, "%*s%-*s %d\n", indent, "", fwidth, - "mdc_jnl_file_name_len:", + "mdc_jnl_file_name_len:", (int)(mesg->mdc_jnl_file_name_len)); HDfprintf(stream, "%*s%-*s \"%s\"\n", indent, "", fwidth, - "mdc_jnl_file_name:", + "mdc_jnl_file_name:", (char *)(mesg->mdc_jnl_file_name)); FUNC_LEAVE_NOAPI(SUCCEED) diff --git a/src/H5Omessage.c b/src/H5Omessage.c index 38cce08..d3c14cd 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -74,7 +74,7 @@ typedef struct { /********************/ static herr_t H5O_msg_reset_real(const H5O_msg_class_t *type, void *native); -static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, +static herr_t H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence, hbool_t *oh_modified, void *_udata/*in,out*/); static herr_t H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx, const H5O_msg_class_t *type, const void *mesg, unsigned mesg_flags, @@ -1685,7 +1685,7 @@ H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg) HDassert(share); HDassert(share->type != H5O_SHARE_TYPE_UNSHARED); - /* If there's a special action for this class that needs to be performed + /* If there's a special action for this class that needs to be performed * when setting the shared component, do that */ if(type->set_share) { diff --git a/src/H5Omtime.c b/src/H5Omtime.c index df4bdd4..be6c754 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -242,7 +242,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_fla the_time -= tz.tz_minuteswest * 60 - (tm.tm_isdst ? 3600 : 0); } -#else +#else /* * The catch-all. If we can't convert a character string universal * coordinated time to a time_t value reliably then we can't decode the diff --git a/src/H5Opkg.h b/src/H5Opkg.h index 2e180ef..d18d7e6 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -43,7 +43,7 @@ */ #define H5O_VERSION_2 2 -/* The latest version of the format. Look through the 'flush' +/* The latest version of the format. Look through the 'flush' * and 'size' callback for places to change when updating this. */ #define H5O_VERSION_LATEST H5O_VERSION_2 @@ -450,7 +450,7 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_NAME[1]; */ H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME[1]; -/* Shared Message information message (0x000f) +/* Shared Message information message (0x000f) * A message for the superblock extension, holding information about * the file-wide shared message "SOHM" table */ @@ -468,13 +468,13 @@ H5_DLLVAR const H5O_msg_class_t H5O_MSG_STAB[1]; */ H5_DLLVAR const H5O_msg_class_t H5O_MSG_MTIME_NEW[1]; -/* v1 B-tree 'K' value message (0x0013) +/* v1 B-tree 'K' value message (0x0013) * A message for the superblock extension, holding information about * the file-wide v1 B-tree 'K' values. */ H5_DLLVAR const H5O_msg_class_t H5O_MSG_BTREEK[1]; -/* Driver info message (0x0014) +/* Driver info message (0x0014) * A message for the superblock extension, holding information about * the file driver settings */ @@ -573,7 +573,7 @@ H5_DLL herr_t H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg); H5_DLL herr_t H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, const H5O_msg_class_t *mesg_type, H5O_shared_t *sh_mesg); -H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, +H5_DLL herr_t H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst, const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst, hbool_t *recompute_size, H5O_copy_t *cpy_info, void *udata, hid_t dxpl_id); H5_DLL herr_t H5O_shared_post_copy_file (H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *mesg); diff --git a/src/H5Opline.c b/src/H5Opline.c index 9a926c1..5f983ff 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -38,7 +38,7 @@ static void *H5O_pline_copy(const void *_mesg, void *_dest); static size_t H5O_pline_size(const H5F_t *f, const void *_mesg); static herr_t H5O_pline_reset(void *_mesg); static herr_t H5O_pline_free(void *_mesg); -static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, +static herr_t H5O_pline_pre_copy_file(H5F_t *file_src, const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *_udata); static herr_t H5O_pline_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int indent, int fwidth); diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 4cac29d..657b3b5 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -517,11 +517,11 @@ typedef uint32_t H5O_refcount_t; /* Contains # of links to object, if >1 * below: * * mdc_jnl_enabled: Boolean flag indicating whether metadata journaling - * is currently enabled. + * is currently enabled. * * mdc_jnl_magic: Randomly selected int32_t used to reduce the possibility - * of running the wrong journal on an HDF5 file. The basic idea is - * to pick a random number, store it in both the HDF5 file and the + * of running the wrong journal on an HDF5 file. The basic idea is + * to pick a random number, store it in both the HDF5 file and the * journal file, and then refuse to run the journal unless the numbers * match. * @@ -531,8 +531,8 @@ typedef uint32_t H5O_refcount_t; /* Contains # of links to object, if >1 * * The value of this field is undefined unless mdc_jnl_enabled is TRUE. * - * mdc_jnl_file_name: Array of char of length - * H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal + * mdc_jnl_file_name: Array of char of length + * H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal * file path. * * The value of this field is undefined unless mdc_jnl_enabled is TRUE. @@ -656,7 +656,7 @@ H5_DLL herr_t H5O_msg_get_crt_index(unsigned type_id, const void *mesg, H5O_msg_crt_idx_t *crt_idx); H5_DLL herr_t H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared, unsigned char *buf, const void *obj); -H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id, +H5_DLL void* H5O_msg_decode(H5F_t *f, hid_t dxpl_id, unsigned type_id, const unsigned char *buf); H5_DLL herr_t H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id, void *mesg); diff --git a/src/H5Opublic.h b/src/H5Opublic.h index acce42c..ddf1a93 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -171,7 +171,7 @@ H5_DLL herr_t H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_DLL herr_t H5Oclose(hid_t object_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Oshared.c b/src/H5Oshared.c index e406065..9e0c4b2 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -489,7 +489,7 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, HDassert(f); HDassert(sh_mesg); - /* + /* * Committed datatypes increment the OH of the original message when they * are written (in H5O_shared_link) and decrement it here. * SOHMs in the heap behave differently; their refcount is incremented @@ -555,7 +555,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst, +H5O_shared_copy_file(H5F_t UNUSED *file_src, H5F_t *file_dst, const H5O_msg_class_t *mesg_type, const void *_native_src, void *_native_dst, hbool_t UNUSED *recompute_size, H5O_copy_t *cpy_info, void UNUSED *udata, hid_t dxpl_id) @@ -614,7 +614,7 @@ done: * Purpose: Delate a shared message and replace with a new one. * The function is needed at cases such as coping a shared reg_ref attribute. * When a shared reg_ref attribute is copied from one file to - * another, the values in file need to be replaced. The only way + * another, the values in file need to be replaced. The only way * to complish that is to delete the old message and write the * new message with the correct values. * diff --git a/src/H5Oshared.h b/src/H5Oshared.h index 582d29b..0482e71 100644 --- a/src/H5Oshared.h +++ b/src/H5Oshared.h @@ -350,7 +350,7 @@ done: if(!ret_value) if(dst_mesg) H5O_msg_free(H5O_SHARED_TYPE->id, dst_mesg); - + FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_SHARED_COPY_FILE() */ @@ -395,7 +395,7 @@ H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src, #ifdef H5O_SHARED_POST_COPY_FILE_REAL /* Call native message's copy file callback to copy the message */ - if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 ) + if(H5O_SHARED_POST_COPY_FILE_REAL(oloc_src, mesg_src, oloc_dst, mesg_dst, dxpl_id, cpy_info) <0 ) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy native message to another file") #endif /* H5O_SHARED_POST_COPY_FILE_REAL */ diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 49c59bf..2ee2802 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -254,7 +254,7 @@ H5P_dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void UNUSED *copy_data) { dst_efl.slot[i].name_offset = 0; } - + } diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 8bc263a..11d8ddb 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -572,7 +572,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression) /* See if a data transform is already set, and free it if it is */ if(H5P_get(plist, H5D_XFER_XFORM_NAME, &data_xform_prop) >= 0) H5Z_xform_destroy(data_xform_prop); - + /* Create data transform info from expression */ if(NULL == (data_xform_prop = H5Z_xform_create(expression))) HGOTO_ERROR(H5E_PLINE, H5E_NOSPACE, FAIL, "unable to create data transform info") diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 8fd4909..e7f0518 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -100,7 +100,7 @@ static herr_t H5P_fcrt_reg_prop(H5P_genclass_t *pclass); /* File creation property list class library initialization object */ const H5P_libclass_t H5P_CLS_FCRT[1] = {{ - "file create", /* Class name for debugging */ + "file create", /* Class name for debugging */ &H5P_CLS_GROUP_CREATE_g, /* Parent class ID */ &H5P_CLS_FILE_CREATE_g, /* Pointer to class ID */ &H5P_LST_FILE_CREATE_g, /* Pointer to default property list ID */ @@ -878,7 +878,7 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_ /* Check that values are sensible. The min_btree value must be no greater * than the max list plus one. - * + * * Range check to make certain they will fit into encoded form. */ if(max_list + 1 < min_btree) diff --git a/src/H5Plapl.c b/src/H5Plapl.c index 8987c49..db80148 100644 --- a/src/H5Plapl.c +++ b/src/H5Plapl.c @@ -315,7 +315,7 @@ done: * Purpose: Set a prefix to be applied to the path of any external links * traversed. The prefix is appended to the filename stored * in the external link. - * + * * Return: Non-negative on success/Negative on failure * * Programmer: James Laird diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 52cc945..9e7bea8 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -385,7 +385,7 @@ H5_DLL herr_t H5Pset_copy_object(hid_t plist_id, unsigned crt_intmd); H5_DLL herr_t H5Pget_copy_object(hid_t plist_id, unsigned *crt_intmd /*out*/); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Ptest.c b/src/H5Ptest.c index 4a3bca5..a91da47 100644 --- a/src/H5Ptest.c +++ b/src/H5Ptest.c @@ -154,8 +154,8 @@ H5P_reset_external_file_test(hid_t dcpl_id) /* Check arguments */ if(NULL == (plist = H5I_object(dcpl_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list") - - /* get external file list */ + + /* get external file list */ if(H5P_get(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list") @@ -163,7 +163,7 @@ H5P_reset_external_file_test(hid_t dcpl_id) if(H5O_msg_reset(H5O_EFL_ID, &efl) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTFREE, FAIL, "can't release external file list info") - /* set external file list */ + /* set external file list */ if(H5P_set(plist, H5D_CRT_EXT_FILE_LIST_NAME, &efl) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get external file list") diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h index 975104e..04d319b 100644 --- a/src/H5Rpublic.h +++ b/src/H5Rpublic.h @@ -68,7 +68,7 @@ H5_DLL ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *ref, char *name/*out*/, size_t size); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS @@ -69,7 +69,7 @@ static herr_t H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *cache_flags_ptr); static herr_t H5SM_decr_ref(void *record, void *op_data, hbool_t *changed); static herr_t H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, - H5SM_index_header_t *header, const H5O_shared_t * mesg, + H5SM_index_header_t *header, const H5O_shared_t * mesg, unsigned *cache_flags, void ** /*out*/ encoded_mesg); static herr_t H5SM_type_to_flag(unsigned type_id, unsigned *type_flag); static herr_t H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg, unsigned sequence, @@ -2039,7 +2039,7 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data) herr_t H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id, const H5O_shared_t *sh_mesg, hsize_t *ref_count) -{ +{ H5HF_t *fheap = NULL; /* Fractal heap that contains shared messages */ H5SM_master_table_t *table = NULL; /* SOHM master table */ H5SM_list_t *list = NULL; /* SOHM index list for message type (if in list form) */ @@ -2581,7 +2581,7 @@ done: * * Purpose: Loop through the master SOHM table (if there is one) to: * 1. collect storage used for header - * 1. collect storage used for B-tree and List + * 1. collect storage used for B-tree and List * (include btree storage used by huge objects in fractal heap) * 2. collect fractal heap storage * diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 35b13ba..5945cea 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -63,7 +63,7 @@ static herr_t H5SM_table_free_icr(haddr_t addr, size_t len, void *thing); static void *H5SM_list_deserialize(haddr_t addr, size_t len, const void *image, void *udata, hbool_t *dirty); -static herr_t H5SM_list_serialize(const H5F_t * f, hid_t dxpl_id, haddr_t addr, +static herr_t H5SM_list_serialize(const H5F_t * f, hid_t dxpl_id, haddr_t addr, size_t len, void *image, void *thing, unsigned *flags, haddr_t *new_addr, size_t *new_len, void **new_image); static herr_t H5SM_list_free_icr(haddr_t addr, size_t len, void *thing); @@ -121,7 +121,7 @@ const H5AC2_class_t H5AC2_SOHM_LIST[1] = {{ *------------------------------------------------------------------------- */ static void * -H5SM_table_deserialize(haddr_t UNUSED addr, size_t UNUSED len, +H5SM_table_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image, void *_udata, hbool_t UNUSED *dirty) { H5SM_master_table_t *table = NULL; @@ -224,7 +224,7 @@ done: (void)H5SM_table_dest(table); FUNC_LEAVE_NOAPI(ret_value) -} /* end H5SM_table_deserialize() */ +} /* end H5SM_table_deserialize() */ /*------------------------------------------------------------------------- @@ -242,7 +242,7 @@ done: */ static herr_t H5SM_table_serialize(const H5F_t * f, hid_t UNUSED dxlp_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5SM_master_table_t *table = (H5SM_master_table_t *)_thing; @@ -254,7 +254,7 @@ H5SM_table_serialize(const H5F_t * f, hid_t UNUSED dxlp_id, haddr_t UNUSED addr, /* check arguments */ HDassert(f); - HDassert(image); + HDassert(image); HDassert(table); HDassert(H5F_addr_defined(addr)); @@ -340,7 +340,7 @@ H5SM_table_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) /* Destroy Shared Object Header Message */ H5SM_table_dest(thing); - + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5SM_table_free_icr() */ @@ -454,8 +454,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5SM_list_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, - size_t UNUSED len, void *image, void *_thing, unsigned *flags, +H5SM_list_serialize(const H5F_t * f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr, + size_t UNUSED len, void *image, void *_thing, unsigned *flags, haddr_t UNUSED *new_addr, size_t UNUSED *new_len, void UNUSED **new_image) { H5SM_list_t *list = (H5SM_list_t *)_thing; @@ -536,6 +536,6 @@ H5SM_list_free_icr(haddr_t UNUSED addr, size_t UNUSED len, void *thing) /* Destroy Shared Object Header Message */ H5SM_list_dest(thing); - + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5SM_list_free_icr() */ diff --git a/src/H5SMtest.c b/src/H5SMtest.c index d2afe6c..b74d27a 100644 --- a/src/H5SMtest.c +++ b/src/H5SMtest.c @@ -78,7 +78,7 @@ herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, size_t *mesg_count) -{ +{ H5SM_master_table_t *table = NULL; /* SOHM master table */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 725b8fc..1f69706 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -293,7 +293,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size, goto empty; #ifdef H5S_DEBUG if(H5DEBUG(S)) - HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC); + HDfprintf(H5DEBUG(S),"%s: Non-flattened selection\n",FUNC); #endif for ( i=0; i<rank; ++i) { d[i].start = diminfo[i].start+space->select.offset[i]; diff --git a/src/H5Spkg.h b/src/H5Spkg.h index e13e6be..b7818a2 100644 --- a/src/H5Spkg.h +++ b/src/H5Spkg.h @@ -44,7 +44,7 @@ */ #define H5O_SDSPACE_VERSION_2 2 -/* The latest version of the format. Look through the 'encode' +/* The latest version of the format. Look through the 'encode' * and 'size' callbacks for places to change when updating this. */ #define H5O_SDSPACE_VERSION_LATEST H5O_SDSPACE_VERSION_2 @@ -4476,7 +4476,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, } /* Set the flag to indicate both source and destination types are compound types - * for the optimization of data reading (in H5Dio.c). */ + * for the optimization of data reading (in H5Dio.c). */ if(H5T_COMPOUND==H5T_get_class(src, TRUE) && H5T_COMPOUND==H5T_get_class(dst, TRUE)) path->are_compounds = TRUE; @@ -4528,8 +4528,8 @@ H5T_path_noop(const H5T_path_t *p) * Function: H5T_path_compound_subset * * Purpose: Checks if the source and destination types are both compound. - * Tells whether whether the source members are a subset of - * destination, and the order is the same, and no conversion + * Tells whether whether the source members are a subset of + * destination, and the order is the same, and no conversion * is needed. For example: * struct source { struct destination { * TYPE1 A; --> TYPE1 A; diff --git a/src/H5Tconv.c b/src/H5Tconv.c index a91c09a..b92c894 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -35,7 +35,7 @@ typedef struct H5T_conv_struct_t { hid_t *src_memb_id; /*source member type ID's */ hid_t *dst_memb_id; /*destination member type ID's */ H5T_path_t **memb_path; /*conversion path for each member */ - H5T_subset_t smembs_subset; /*are source and dest members a subset of each other? */ + H5T_subset_t smembs_subset; /*are source and dest members a subset of each other? */ } H5T_conv_struct_t; /* Conversion data for H5T_conv_enum() */ @@ -1703,8 +1703,8 @@ done: * * Modifications: * Raymond Lu, 3 May 2007 - * Added the detection for a special optimization case when the - * source and destination members are a subset of each other, and + * Added the detection for a special optimization case when the + * source and destination members are a subset of each other, and * the order is the same, and no conversion is needed. For example: * struct source { struct destination { * TYPE1 A; --> TYPE1 A; @@ -1721,9 +1721,9 @@ done: * }; TYPE4 D; * TYPE5 E; * }; - * The optimization is simply moving data to the appropriate + * The optimization is simply moving data to the appropriate * places in the buffer. - * + * *------------------------------------------------------------------------- */ static herr_t @@ -1834,9 +1834,9 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id) priv->smembs_subset = H5T_SUBSET_SRC; for (i=0; i<src_nmembs; i++) { /* If any of source members doesn't have counterpart in the same order or - * there's conversion between members, don't do the optimization. */ + * there's conversion between members, don't do the optimization. */ if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset != - dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == + dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE) priv->smembs_subset = H5T_SUBSET_FALSE; } @@ -1844,16 +1844,16 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id) priv->smembs_subset = H5T_SUBSET_DST; for (i=0; i<dst_nmembs; i++) { /* If any of source members doesn't have counterpart in the same order or - * there's conversion between members, don't do the optimization. */ + * there's conversion between members, don't do the optimization. */ if(src2dst[i] != i || (src->shared->u.compnd.memb[i].offset != - dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == + dst->shared->u.compnd.memb[i].offset) || (priv->memb_path[i])->is_noop == FALSE) priv->smembs_subset = H5T_SUBSET_FALSE; } } else /* If the numbers of source and dest members are equal and no conversion is needed, * the case should have been handled as noop earlier in H5Dio.c. */ ; - + } cdata->recalc = FALSE; @@ -1868,7 +1868,7 @@ done: * * Purpose: A quick way to return a field in a struct private in this * file. The flag SMEMBS_SUBSET indicates whether the source - * members are a subset of destination or the destination + * members are a subset of destination or the destination * members are a subset of the source, and the order is the * same, and no conversion is needed. For example: * struct source { struct destination { @@ -1879,7 +1879,7 @@ done: * TYPE5 E; * }; * - * Return: One of the value from H5T_subset_t. + * Return: One of the value from H5T_subset_t. * * Programmer: Raymond Lu * 8 June 2007 @@ -2173,8 +2173,8 @@ done: * datatype. * * Raymond Lu, 3 May 2007 - * Optimize a special case when the source and destination members - * are a subset of each other, and the order is the same, and no + * Optimize a special case when the source and destination members + * are a subset of each other, and the order is the same, and no * conversion is needed. For example: * struct source { struct destination { * TYPE1 A; --> TYPE1 A; @@ -2183,9 +2183,9 @@ done: * }; TYPE4 D; * TYPE5 E; * }; - * The optimization is simply moving data to the appropriate + * The optimization is simply moving data to the appropriate * places in the buffer. - * + * *------------------------------------------------------------------------- */ herr_t @@ -2323,16 +2323,16 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, } if(priv->smembs_subset == H5T_SUBSET_SRC || priv->smembs_subset == H5T_SUBSET_DST) { - /* If the optimization flag is set to indicate source members are a subset and + /* If the optimization flag is set to indicate source members are a subset and * in the top of the destination, simply copy the source members to background buffer. */ xbuf = buf; xbkg = bkg; if(dst->shared->size <= src->shared->size) /* This is to deal with a very special situation when the fields and their - * offset for both source and destination are identical but the datatype - * sizes of source and destination are different. The library still - * considers these two types different and does conversion. It happens - * in table API test (hdf5/hl/test/test_table.c) when a table field is + * offset for both source and destination are identical but the datatype + * sizes of source and destination are different. The library still + * considers these two types different and does conversion. It happens + * in table API test (hdf5/hl/test/test_table.c) when a table field is * deleted. */ copy_size = dst->shared->size; @@ -2340,7 +2340,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, copy_size = src->shared->size; for (elmtno=0; elmtno<nelmts; elmtno++) { - HDmemmove(xbkg, xbuf, copy_size); + HDmemmove(xbkg, xbuf, copy_size); /* Update pointers */ xbuf += buf_stride; @@ -3049,7 +3049,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, uint8_t *tmp_p; /* TMP_P is reset each time in the loop because DST_BASE_SIZE may include some data in addition to VL info. - SLU */ for(u=seq_len; u<bg_seq_len; u++) { - tmp_p = (uint8_t*)tmp_buf + u*dst_base_size; + tmp_p = (uint8_t*)tmp_buf + u*dst_base_size; UINT32DECODE(tmp_p, parent_seq_len); if(parent_seq_len>0) { H5F_addr_decode(dst->shared->u.vlen.f, (const uint8_t **)&tmp_p, &(parent_hobjid.addr)); diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 36f8006..ba3d749 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -73,7 +73,7 @@ typedef struct H5T_conv_cb_t { */ typedef enum { H5T_SUBSET_BADVALUE = -1, /* Invalid value */ - H5T_SUBSET_FALSE = 0, /* Source and destination aren't subset of each other */ + H5T_SUBSET_FALSE = 0, /* Source and destination aren't subset of each other */ H5T_SUBSET_SRC, /* Source is the subset of dest and no conversion is needed */ H5T_SUBSET_DST, /* Dest is the subset of source and no conversion is needed */ H5T_SUBSET_CAP /* Must be the last value */ diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h index 40a2a4d..95539ab 100644 --- a/src/H5Tpublic.h +++ b/src/H5Tpublic.h @@ -592,7 +592,7 @@ H5_DLL herr_t H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *background, hid_t plist_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. - * + * * Use of these symbols is deprecated. */ #ifndef H5_NO_DEPRECATED_SYMBOLS diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h index 7211a2b..ce60650 100644 --- a/src/H5Zpublic.h +++ b/src/H5Zpublic.h @@ -77,7 +77,7 @@ typedef int H5Z_filter_t; /* Macros for the shuffle filter */ #define H5Z_SHUFFLE_USER_NPARMS 0 /* Number of parameters that users can set */ #define H5Z_SHUFFLE_TOTAL_NPARMS 1 /* Total number of parameters for filter */ - + /* Macros for the szip filter */ #define H5Z_SZIP_USER_NPARMS 2 /* Number of parameters that users can set */ #define H5Z_SZIP_TOTAL_NPARMS 4 /* Total number of parameters for filter */ @@ -85,7 +85,7 @@ typedef int H5Z_filter_t; #define H5Z_SZIP_PARM_PPB 1 /* "User" parameter for pixels-per-block */ #define H5Z_SZIP_PARM_BPP 2 /* "Local" parameter for bits-per-pixel */ #define H5Z_SZIP_PARM_PPS 3 /* "Local" parameter for pixels-per-scanline */ - + /* Macros for the nbit filter */ #define H5Z_NBIT_USER_NPARMS 0 /* Number of parameters that users can set */ diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index a58988e..d80d415 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -977,7 +977,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size if(H5Z_xform_eval_full(tree, array_size, array_type, &res) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "error while performing data transform") - if(data_xform_prop->dat_val_pointers->num_ptrs > 1) + if(data_xform_prop->dat_val_pointers->num_ptrs > 1) HDmemcpy(array, res.value.dat_val, array_size * H5Tget_size(array_type)); /* Free the temporary arrays we used */ diff --git a/src/H5checksum.c b/src/H5checksum.c index 3359722..6c01508 100644 --- a/src/H5checksum.c +++ b/src/H5checksum.c @@ -270,7 +270,7 @@ This was tested for: the output delta to a Gray code (a^(a>>1)) so a string of 1's (as is commonly produced by subtraction) look like a single 1-bit difference. -* the base values were pseudorandom, all zero but one bit set, or +* the base values were pseudorandom, all zero but one bit set, or all zero plus a counter that starts at zero. Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that @@ -280,7 +280,7 @@ satisfy this are 14 9 3 7 17 3 Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing for "differ" defined as + with a one-bit base and a two-bit delta. I -used http://burtleburtle.net/bob/hash/avalanche.html to choose +used http://burtleburtle.net/bob/hash/avalanche.html to choose the operations, constants, and arrangements of the variables. This does not achieve avalanche. There are input bits of (a,b,c) @@ -320,7 +320,7 @@ produce values of c that look totally different. This was tested for the output delta to a Gray code (a^(a>>1)) so a string of 1's (as is commonly produced by subtraction) look like a single 1-bit difference. -* the base values were pseudorandom, all zero but one bit set, or +* the base values were pseudorandom, all zero but one bit set, or all zero plus a counter that starts at zero. These constants passed: diff --git a/src/H5private.h b/src/H5private.h index d5c412a..ae71826 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -495,7 +495,7 @@ typedef struct { * Redefine all the POSIX functions. We should never see a POSIX * function (or any other non-HDF5 function) in the source! */ - + /* Use platform-specific versions if necessary */ #include "H5win32defs.h" @@ -503,7 +503,7 @@ typedef struct { #define HDabort() abort() #endif /* HDabort */ #ifndef HDabs - #define HDabs(X) abs(X) + #define HDabs(X) abs(X) #endif /* HDabs */ #ifndef HDaccess #define HDaccess(F,M) access(F, M) diff --git a/src/H5system.c b/src/H5system.c index b713441..980d840 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -626,7 +626,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/) *extpath = NULL; - /* + /* * Unix: name[0] is a "/" * Windows: name[0-2] is "<drive letter>:\" or "<drive-letter>:/" */ @@ -639,17 +639,17 @@ H5_build_extpath(const char *name, char **extpath/*out*/) if (NULL == (new_name = (char *)H5MM_strdup(name))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - /* + /* * Windows: name[0-1] is "<drive-letter>:" - * Get current working directory on the drive specified in NAME + * Get current working directory on the drive specified in NAME * Unix: does not apply */ if (CHECK_ABS_DRIVE(name)) { drive = name[0] - 'A' + 1; retcwd = HDgetdcwd(drive, cwdpath, MAX_PATH_LEN); HDstrcpy(new_name, &name[2]); - /* - * Windows: name[0] is a '/' or '\' + /* + * Windows: name[0] is a '/' or '\' * Get current drive * Unix: does not apply */ @@ -696,11 +696,11 @@ done: * * Function: H5_get_free_ram * - * Purpose: Determine how much free ram the host system contains, and - * return that value in bytes. If this data is not available, + * Purpose: Determine how much free ram the host system contains, and + * return that value in bytes. If this data is not available, * return 0. * - * Return: Number of bytes of free ram on the host system, or + * Return: Number of bytes of free ram on the host system, or * zero if unable to determine this value. * * Programmer: John Mainzer @@ -713,7 +713,7 @@ H5_get_free_ram(void) { /* const char * fcn_name = "H5_get_free_ram()"; */ unsigned long long free_ram = 0; - + #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */ #ifdef H5_HAVE_SYSINFO /* LINUX */ { @@ -742,11 +742,11 @@ H5_get_free_ram(void) * * Function: H5_get_free_swap * - * Purpose: Determine how much free swap the host system contains, and - * return that value in bytes. If this data is not available, + * Purpose: Determine how much free swap the host system contains, and + * return that value in bytes. If this data is not available, * return 0. * - * Return: Number of bytes of free swap on the host system, or + * Return: Number of bytes of free swap on the host system, or * zero if unable to determine this value. * * Programmer: John Mainzer @@ -759,7 +759,7 @@ H5_get_free_swap(void) { /* const char * fcn_name = "H5_get_free_swap()"; */ unsigned long long free_swap = 0; - + #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */ #ifdef H5_HAVE_SYSINFO /* LINUX */ { @@ -788,11 +788,11 @@ H5_get_free_swap(void) * * Function: H5_get_physical_ram * - * Purpose: Determine how much physical ram the host system contains, and - * return that value in bytes. If this data is not available, + * Purpose: Determine how much physical ram the host system contains, and + * return that value in bytes. If this data is not available, * return 0. * - * Return: Number of bytes of physical ram on the host system, or + * Return: Number of bytes of physical ram on the host system, or * zero if unable to determine this value. * * Programmer: John Mainzer @@ -805,7 +805,7 @@ H5_get_physical_ram(void) { /* const char * fcn_name = "H5_get_physical_ram()"; */ unsigned long long physical_ram = 0; - + #ifdef H5_HAVE_SYS_SYSINFO_H /* LINUX */ #ifdef H5_HAVE_SYSINFO /* LINUX */ { @@ -841,7 +841,7 @@ H5_get_physical_ram(void) if ( len == sizeof(l_physical_mem) ) { - if ( sysctl(pm_mib, 2, &l_physical_mem, &len, NULL, (size_t)0) + if ( sysctl(pm_mib, 2, &l_physical_mem, &len, NULL, (size_t)0) == -1 ) { /* sysctl() failed for some reason -- do nothing */ @@ -853,7 +853,7 @@ H5_get_physical_ram(void) } } else if ( len == sizeof(ll_physical_mem) ) { - if ( sysctl(pm_mib, 2, &ll_physical_mem, &len, NULL, (size_t)0) + if ( sysctl(pm_mib, 2, &ll_physical_mem, &len, NULL, (size_t)0) == -1 ) { /* sysctl() failed for some reason -- do nothing */ @@ -865,9 +865,9 @@ H5_get_physical_ram(void) } else { - /* the initial call to sysctl() returned an unexpected size - * for the field in which to return the number of bytes of - * physical memory. We don't know how to handle this, so + /* the initial call to sysctl() returned an unexpected size + * for the field in which to return the number of bytes of + * physical memory. We don't know how to handle this, so * just do nothing. */ |