diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:24:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:24:08 (GMT) |
| commit | 772d09112253a0d86f93a551299c2601aebddcca (patch) | |
| tree | ad90ff73b4ea7f5f9d9b490094eb4d77f1789b6e | |
| parent | 62199d8ca155f98543548e896c8dada2225db3dd (diff) | |
| download | hdf5-772d09112253a0d86f93a551299c2601aebddcca.zip hdf5-772d09112253a0d86f93a551299c2601aebddcca.tar.gz hdf5-772d09112253a0d86f93a551299c2601aebddcca.tar.bz2 | |
[svn-r18723] Description:
Rename H5[A]C_rename to H5[A]C_move_entry.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug & production
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
| -rw-r--r-- | src/H5AC.c | 105 | ||||
| -rw-r--r-- | src/H5ACpkg.h | 18 | ||||
| -rw-r--r-- | src/H5ACprivate.h | 4 | ||||
| -rw-r--r-- | src/H5B.c | 2 | ||||
| -rw-r--r-- | src/H5C.c | 172 | ||||
| -rw-r--r-- | src/H5Cjournal.c | 6 | ||||
| -rw-r--r-- | src/H5Cpkg.h | 91 | ||||
| -rw-r--r-- | src/H5Cprivate.h | 24 | ||||
| -rw-r--r-- | src/H5Edefin.h | 4 | ||||
| -rw-r--r-- | src/H5Einit.h | 12 | ||||
| -rw-r--r-- | src/H5Epubgen.h | 6 | ||||
| -rw-r--r-- | src/H5Eterm.h | 4 | ||||
| -rw-r--r-- | src/H5FSsection.c | 8 | ||||
| -rw-r--r-- | src/H5HFcache.c | 4 | ||||
| -rw-r--r-- | src/H5HFiblock.c | 6 | ||||
| -rw-r--r-- | src/H5HL.c | 4 | ||||
| -rw-r--r-- | src/H5err.txt | 4 | ||||
| -rw-r--r-- | test/cache.c | 324 | ||||
| -rw-r--r-- | test/cache_common.c | 52 | ||||
| -rw-r--r-- | test/cache_common.h | 24 | ||||
| -rw-r--r-- | test/cache_journal.c | 138 | ||||
| -rw-r--r-- | testpar/t_cache.c | 72 |
22 files changed, 484 insertions, 600 deletions
@@ -93,7 +93,7 @@ H5FL_DEFINE_STATIC(H5AC_aux_t); * * addr: file offset of a metadata entry. Entries are added to this * list (if they aren't there already) when they are marked - * dirty in an unprotect, inserted, or renamed. They are + * dirty in an unprotect, inserted, or moved. They are * removed when they appear in a clean entries broadcast. * ****************************************************************************/ @@ -191,7 +191,7 @@ static herr_t H5AC_receive_and_apply_clean_list(H5F_t * f, hid_t dxpl_id, H5AC_t * cache_ptr); -static herr_t H5AC_log_renamed_entry(const H5F_t * f, +static herr_t H5AC_log_moved_entry(const H5F_t * f, haddr_t old_addr, haddr_t new_addr); #endif /* H5_HAVE_PARALLEL */ @@ -587,8 +587,8 @@ H5AC_create(const H5F_t *f, aux_ptr->unprotect_dirty_bytes_updates = 0; aux_ptr->insert_dirty_bytes = 0; aux_ptr->insert_dirty_bytes_updates = 0; - aux_ptr->rename_dirty_bytes = 0; - aux_ptr->rename_dirty_bytes_updates = 0; + aux_ptr->move_dirty_bytes = 0; + aux_ptr->move_dirty_bytes_updates = 0; #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ aux_ptr->d_slist_ptr = NULL; aux_ptr->d_slist_len = 0; @@ -1453,7 +1453,7 @@ done: * The type and addr parameters are retained to avoid source * code changed, but values other than NULL and HADDR_UNDEF * respectively are errors. If all goes well, they should - * be removed, and the function renamed to something more + * be removed, and the function moved to something more * descriptive -- perhaps H5AC_flush_cache. * * If the cache contains protected entries, the function will @@ -1561,8 +1561,8 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags) (int)(aux_ptr->unprotect_dirty_bytes_updates), (int)(aux_ptr->insert_dirty_bytes), (int)(aux_ptr->insert_dirty_bytes_updates), - (int)(aux_ptr->rename_dirty_bytes), - (int)(aux_ptr->rename_dirty_bytes_updates)); + (int)(aux_ptr->move_dirty_bytes), + (int)(aux_ptr->move_dirty_bytes_updates)); #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ /* to prevent "messages from the future" we must synchronize all @@ -1981,7 +1981,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5AC_rename + * Function: H5AC_move_entry * * Purpose: Use this function to notify the cache that an object's * file address changed. @@ -1992,41 +1992,10 @@ done: * matzke@llnl.gov * Jul 9 1997 * - * Modifications: - * Robb Matzke, 1999-07-27 - * The OLD_ADDR and NEW_ADDR arguments are passed by value. - * - * JRM 5/17/04 - * Complete rewrite for the new meta-data cache. - * - * JRM - 6/7/04 - * Abstracted the guts of the function to H5C_rename_entry() - * in H5C.c, and then re-wrote the function as a wrapper for - * H5C_rename_entry(). - * - * JRM - 7/5/05 - * Added code to track dirty byte generation, and to trigger - * clean entry list propagation when it exceeds a user - * specified threshold. Note that this code only applies in - * the PHDF5 case. It should have no effect on either the - * serial or FPHSD5 cases. - * - * Note that this code presumes that the renamed entry will - * be present in all caches -- which it must be at present. - * To maintain this invarient, only rename entries immediately - * after you unprotect them. - * - * JRM - 6/6/06 - * Added trace file support. - * - * JRM - 10/18/07 - * Modified code in support of revised cache API needed - * to permit journaling. - * *------------------------------------------------------------------------- */ herr_t -H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr) +H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr) { herr_t result; herr_t ret_value=SUCCEED; /* Return value */ @@ -2038,7 +2007,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_ad FILE * trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ - FUNC_ENTER_NOAPI(H5AC_rename, FAIL) + FUNC_ENTER_NOAPI(H5AC_move_entry, FAIL) HDassert(f); HDassert(f->shared->cache); @@ -2048,7 +2017,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 move 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. */ @@ -2058,7 +2027,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_ad ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) && ( trace_file_ptr != NULL ) ) { - sprintf(trace, "H5AC_rename 0x%lx 0x%lx %d", + sprintf(trace, "H5AC_move_entry 0x%lx 0x%lx %d", (unsigned long)old_addr, (unsigned long)new_addr, (int)(type->id)); @@ -2067,20 +2036,20 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_ad #ifdef H5_HAVE_PARALLEL if ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) { - if(H5AC_log_renamed_entry(f, old_addr, new_addr) < 0) - HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log renamed entry") + if(H5AC_log_moved_entry(f, old_addr, new_addr) < 0) + HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log moved entry") } #endif /* H5_HAVE_PARALLEL */ - result = H5C_rename_entry(f->shared->cache, + result = H5C_move_entry(f->shared->cache, type, old_addr, new_addr); if ( result < 0 ) { - HGOTO_ERROR(H5E_CACHE, H5E_CANTRENAME, FAIL, \ - "H5C_rename_entry() failed.") + HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \ + "H5C_move_entry() failed.") } #ifdef H5_HAVE_PARALLEL @@ -2110,7 +2079,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) -} /* H5AC_rename() */ +} /* H5AC_move_entry() */ /*------------------------------------------------------------------------- @@ -5015,15 +4984,15 @@ done: /*------------------------------------------------------------------------- * - * Function: H5AC_log_renamed_entry() + * Function: H5AC_log_moved_entry() * - * Purpose: Update the dirty_bytes count for a renamed entry. + * Purpose: Update the dirty_bytes count for a moved entry. * * WARNING * - * At present, the way that the rename call is used ensures - * that the renamed entry is present in all caches by - * renaming in a collective operation and immediately after + * At present, the way that the move call is used ensures + * that the moved entry is present in all caches by + * moving in a collective operation and immediately after * unprotecting the target entry. * * This function uses this invarient, and will cause arcane @@ -5031,17 +5000,17 @@ done: * becomes impossible, we will have to rework this function * extensively, and likely include a bit of IPC for * synchronization. A better option might be to subsume - * rename in the unprotect operation. + * move in the unprotect operation. * * Given that the target entry is in all caches, the function * proceeds as follows: * * For processes with mpi rank other 0, it simply checks to - * see if the entry was dirty prior to the rename, and adds + * see if the entry was dirty prior to the move, and adds * the entries size to the dirty bytes count. * * In the process with mpi rank 0, the function first checks - * to see if the entry was dirty prior to the rename. If it + * to see if the entry was dirty prior to the move. If it * was, and if the entry doesn't appear in the dirtied list * under its old address, it adds the entry's size to the * dirty bytes count. @@ -5063,7 +5032,7 @@ done: */ #ifdef H5_HAVE_PARALLEL static herr_t -H5AC_log_renamed_entry(const H5F_t *f, +H5AC_log_moved_entry(const H5F_t *f, haddr_t old_addr, haddr_t new_addr) { @@ -5075,7 +5044,7 @@ H5AC_log_renamed_entry(const H5F_t *f, H5AC_slist_entry_t * slist_entry_ptr = NULL; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5AC_log_renamed_entry, FAIL) + FUNC_ENTER_NOAPI(H5AC_log_moved_entry, FAIL) HDassert( f ); HDassert( f->shared ); @@ -5180,8 +5149,8 @@ H5AC_log_renamed_entry(const H5F_t *f, aux_ptr->dirty_bytes += entry_size; #if H5AC_DEBUG_DIRTY_BYTES_CREATION - aux_ptr->rename_dirty_bytes += entry_size; - aux_ptr->rename_dirty_bytes_updates += 1; + aux_ptr->move_dirty_bytes += entry_size; + aux_ptr->move_dirty_bytes_updates += 1; #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ } @@ -5207,8 +5176,8 @@ H5AC_log_renamed_entry(const H5F_t *f, aux_ptr->dirty_bytes += entry_size; #if H5AC_DEBUG_DIRTY_BYTES_CREATION - aux_ptr->rename_dirty_bytes += entry_size; - aux_ptr->rename_dirty_bytes_updates += 1; + aux_ptr->move_dirty_bytes += entry_size; + aux_ptr->move_dirty_bytes_updates += 1; #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ } @@ -5216,7 +5185,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) -} /* H5AC_log_renamed_entry() */ +} /* H5AC_log_moved_entry() */ #endif /* H5_HAVE_PARALLEL */ @@ -5324,8 +5293,8 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f, (int)(aux_ptr->unprotect_dirty_bytes_updates), (int)(aux_ptr->insert_dirty_bytes), (int)(aux_ptr->insert_dirty_bytes_updates), - (int)(aux_ptr->rename_dirty_bytes), - (int)(aux_ptr->rename_dirty_bytes_updates)); + (int)(aux_ptr->move_dirty_bytes), + (int)(aux_ptr->move_dirty_bytes_updates)); #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ if ( do_barrier ) { @@ -5385,8 +5354,8 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f, aux_ptr->unprotect_dirty_bytes_updates = 0; aux_ptr->insert_dirty_bytes = 0; aux_ptr->insert_dirty_bytes_updates = 0; - aux_ptr->rename_dirty_bytes = 0; - aux_ptr->rename_dirty_bytes_updates = 0; + aux_ptr->move_dirty_bytes = 0; + aux_ptr->move_dirty_bytes_updates = 0; #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ done: diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h index 911aceb..d5346f5 100644 --- a/src/H5ACpkg.h +++ b/src/H5ACpkg.h @@ -107,7 +107,7 @@ * * Maintaining this count is easy for all processes not on process 0 -- * all that is necessary is to add the size of the entry to the total - * whenever there is an insertion, a rename of a previously clean entry, + * whenever there is an insertion, a move of a previously clean entry, * or whever a previously clean entry is marked dirty in an unprotect. * * On process 0, we have to be careful not to count dirty bytes twice. @@ -197,18 +197,18 @@ * been created via insert operations since the last time * the cleaned list was propagated. * - * rename_dirty_bytes: This field only exists when the + * move_dirty_bytes: This field only exists when the * H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE. * * It is used to track the number of dirty bytes created - * via rename operations since the last time the cleaned + * via move operations since the last time the cleaned * list was propagated. * - * rename_dirty_bytes_updates: This field only exists when the + * move_dirty_bytes_updates: This field only exists when the * H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE. * * It is used to track the number of times dirty bytes have - * been created via rename operations since the last time + * been created via move operations since the last time * the cleaned list was propagated. * * d_slist_ptr: Pointer to an instance of H5SL_t used to maintain a list @@ -224,7 +224,7 @@ * * 1) an entry is inserted in the metadata cache, or * - * 2) a previously clean entry is renamed, and it does not + * 2) a previously clean entry is moved, and it does not * already appear in the dirty entry list, or * * 3) a previously clean entry is unprotected with the @@ -234,7 +234,7 @@ * Entries are added to the dirty entry list whever they cause * the dirty bytes count to be increased. They are removed * when they appear in a clean entries broadcast. Note that - * renames must be reflected in the dirty entry list. + * moves must be reflected in the dirty entry list. * * To reitterate, this field is only used on process 0 -- it * should be NULL on all other processes. @@ -303,8 +303,8 @@ typedef struct H5AC_aux_t int32_t insert_dirty_bytes; int32_t insert_dirty_bytes_updates; - int32_t rename_dirty_bytes; - int32_t rename_dirty_bytes_updates; + int32_t move_dirty_bytes; + int32_t move_dirty_bytes_updates; #endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */ diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index 1cf9dcc..2989a5a 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -116,7 +116,7 @@ typedef enum { */ #define H5AC__SERIALIZE_RESIZED_FLAG H5C__SERIALIZE_RESIZED_FLAG -#define H5AC__SERIALIZE_RENAMED_FLAG H5C__SERIALIZE_RENAMED_FLAG +#define H5AC__SERIALIZE_MOVED_FLAG H5C__SERIALIZE_MOVED_FLAG typedef H5C_deserialize_func_t H5AC_deserialize_func_t; typedef H5C_image_len_func_t H5AC_image_len_func_t; @@ -315,7 +315,7 @@ H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id, size_t new_size, void *thing, unsigned flags); H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags); H5_DLL herr_t H5AC_mark_entry_dirty(void *thing); -H5_DLL herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type, +H5_DLL herr_t H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr); H5_DLL herr_t H5AC_dest(H5F_t *f, hid_t dxpl_id); @@ -693,7 +693,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, bt = NULL; /* Make certain future references will be caught */ /* Move the location of the old root on the disk */ - if(H5AC_rename(f, H5AC_BT, addr, old_root) < 0) + if(H5AC_move_entry(f, H5AC_BT, addr, old_root) < 0) HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to move B-tree root node") /* clear the old root info at the old address (we already copied it) */ @@ -1248,7 +1248,7 @@ done: * H5C_t. * * Also reworked function to allow for the possibility that - * entries will be dirtied, resized, or renamed during flush + * entries will be dirtied, resized, or moved during flush * callbacks. As a result, we may have to make multiple * passes through the skip list before the cache is flushed. * @@ -1413,7 +1413,7 @@ H5C_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags) * * To make things more entertaining, with the advent of the * fractal heap, the entry serialize callback can cause entries - * to be dirtied, resized, and/or renamed. + * to be dirtied, resized, and/or moved. * * To deal with this, we first make note of the initial * skip list length and size: @@ -3013,7 +3013,7 @@ done: /*------------------------------------------------------------------------- * - * Function: H5C_rename_entry + * Function: H5C_move_entry * * Purpose: Use this function to notify the cache that an entry's * file address changed. @@ -3023,52 +3023,10 @@ done: * Programmer: John Mainzer * 6/2/04 * - * Modifications: - * - * JRM -- 7/21/04 - * Updated function for the addition of the hash table. - * - * JRM -- 6/6/05 - * Updated function to force all renamed entries to be - * dirty. This is part of a series of code modifications - * moving management of the is_dirty field of - * H5C_cache_entry_t into the H5C code. - * - * JRM -- 4/3/06 - * Updated function to disallow renaming of pinned entries. - * - * JRM -- 4/27/06 - * Updated function to support renaming of pinned entries. - * - * JRM -- 8/24/06 - * Updated function to refrain from altering the index, the - * replacement policy data structures, and skip list when - * the function is called within the flush callback for the - * target entry and the target entry is being destroyed. - * - * Note that in this case H5C_flush_single_entry() will handle - * all these details for us. - * - * JRM -- 10/13/07 - * Renames of the target entry in a serialize callback are - * now handled by H5C_flush_single_entry() -- hence the above - * 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 - * transaction list (if it wasn't there already). - * - * 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 - * entry was serialized to construct its journal entry. - * *------------------------------------------------------------------------- */ herr_t -H5C_rename_entry(H5C_t * cache_ptr, +H5C_move_entry(H5C_t * cache_ptr, const H5C_class_t * type, haddr_t old_addr, haddr_t new_addr) @@ -3082,7 +3040,7 @@ H5C_rename_entry(H5C_t * cache_ptr, #endif /* H5C_DO_SANITY_CHECKS */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5C_rename_entry, FAIL) + FUNC_ENTER_NOAPI(H5C_move_entry, FAIL) HDassert( cache_ptr ); HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC ); @@ -3112,7 +3070,7 @@ H5C_rename_entry(H5C_t * cache_ptr, if ( entry_ptr->is_protected ) { - HGOTO_ERROR(H5E_CACHE, H5E_CANTRENAME, FAIL, \ + HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \ "Target entry is protected.") } @@ -3120,14 +3078,14 @@ H5C_rename_entry(H5C_t * cache_ptr, ( cache_ptr->mdj_enabled ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "rename on destroy when journaling is enabled.\n"); + "move on destroy when journaling is enabled.\n"); } if ( ( entry_ptr->flush_in_progress ) && ( cache_ptr->mdj_enabled ) ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "rename on flush when journaling is enabled.\n"); + "move on flush when journaling is enabled.\n"); } H5C__SEARCH_INDEX(cache_ptr, new_addr, test_entry_ptr, FAIL) @@ -3136,12 +3094,12 @@ H5C_rename_entry(H5C_t * cache_ptr, if ( test_entry_ptr->type == type ) { - HGOTO_ERROR(H5E_CACHE, H5E_CANTRENAME, FAIL, \ - "Target already renamed & reinserted???.") + HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \ + "Target already moved & reinserted???.") } else { - HGOTO_ERROR(H5E_CACHE, H5E_CANTRENAME, FAIL, \ + HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, \ "New address already in use?.") } @@ -3152,7 +3110,7 @@ H5C_rename_entry(H5C_t * cache_ptr, * new address, mark it as dirty (if it isn't already) and then re-insert. * * Update the replacement policy for a hit to avoid an eviction before - * the renamed entry is touched. Update stats for a rename. + * the moved entry is touched. Update stats for a move. * * Note that we do not check the size of the cache, or evict anything. * Since this is a simple re-name, cache size should be unaffected. @@ -3220,7 +3178,7 @@ H5C_rename_entry(H5C_t * cache_ptr, /* make note of whether the target entry had a journal write * in progress -- will need this fact to update the replacement - * policy structures for the rename. + * policy structures for the move. */ had_jwip = ( entry_ptr->last_trans != 0 ); @@ -3229,12 +3187,12 @@ H5C_rename_entry(H5C_t * cache_ptr, */ H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL); - H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, \ + H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, \ had_jwip, FAIL); } } - H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr) + H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr) done: @@ -3248,7 +3206,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) -} /* H5C_rename_entry() */ +} /* H5C_move_entry() */ /*------------------------------------------------------------------------- @@ -4442,9 +4400,9 @@ H5C_stats(H5C_t * cache_ptr, int64_t total_clears = 0; int64_t total_flushes = 0; int64_t total_evictions = 0; - int64_t total_renames = 0; - int64_t total_entry_flush_renames = 0; - int64_t total_cache_flush_renames = 0; + int64_t total_moves = 0; + int64_t total_entry_flush_moves = 0; + int64_t total_cache_flush_moves = 0; int64_t total_size_increases = 0; int64_t total_size_decreases = 0; int64_t total_entry_flush_size_changes = 0; @@ -4493,11 +4451,11 @@ H5C_stats(H5C_t * cache_ptr, total_clears += cache_ptr->clears[i]; total_flushes += cache_ptr->flushes[i]; total_evictions += cache_ptr->evictions[i]; - total_renames += cache_ptr->renames[i]; - total_entry_flush_renames - += cache_ptr->entry_flush_renames[i]; - total_cache_flush_renames - += cache_ptr->cache_flush_renames[i]; + total_moves += cache_ptr->moves[i]; + total_entry_flush_moves + += cache_ptr->entry_flush_moves[i]; + total_cache_flush_moves + += cache_ptr->cache_flush_moves[i]; total_size_increases += cache_ptr->size_increases[i]; total_size_decreases += cache_ptr->size_decreases[i]; total_entry_flush_size_changes @@ -4645,17 +4603,17 @@ H5C_stats(H5C_t * cache_ptr, (long)total_evictions); HDfprintf(stdout, - "%s Total insertions(pinned) / renames = %ld(%ld) / %ld\n", + "%s Total insertions(pinned) / moves = %ld(%ld) / %ld\n", cache_ptr->prefix, (long)total_insertions, (long)total_pinned_insertions, - (long)total_renames); + (long)total_moves); HDfprintf(stdout, - "%s Total entry / cache flush renames = %ld / %ld\n", + "%s Total entry / cache flush moves = %ld / %ld\n", cache_ptr->prefix, - (long)total_entry_flush_renames, - (long)total_cache_flush_renames); + (long)total_entry_flush_moves, + (long)total_cache_flush_moves); HDfprintf(stdout, "%s Total entry size incrs / decrs = %ld / %ld\n", cache_ptr->prefix, @@ -4739,17 +4697,17 @@ H5C_stats(H5C_t * cache_ptr, (long)(cache_ptr->evictions[i])); HDfprintf(stdout, - "%s insertions(pinned) / renames = %ld(%ld) / %ld\n", + "%s insertions(pinned) / moves = %ld(%ld) / %ld\n", cache_ptr->prefix, (long)(cache_ptr->insertions[i]), (long)(cache_ptr->pinned_insertions[i]), - (long)(cache_ptr->renames[i])); + (long)(cache_ptr->moves[i])); HDfprintf(stdout, - "%s entry / cache flush renames = %ld / %ld\n", + "%s entry / cache flush moves = %ld / %ld\n", cache_ptr->prefix, - (long)(cache_ptr->entry_flush_renames[i]), - (long)(cache_ptr->cache_flush_renames[i])); + (long)(cache_ptr->entry_flush_moves[i]), + (long)(cache_ptr->cache_flush_moves[i])); HDfprintf(stdout, "%s size increases / decreases = %ld / %ld\n", @@ -4881,9 +4839,9 @@ H5C_stats__reset(H5C_t UNUSED * cache_ptr) cache_ptr->clears[i] = 0; cache_ptr->flushes[i] = 0; cache_ptr->evictions[i] = 0; - cache_ptr->renames[i] = 0; - cache_ptr->entry_flush_renames[i] = 0; - cache_ptr->cache_flush_renames[i] = 0; + cache_ptr->moves[i] = 0; + cache_ptr->entry_flush_moves[i] = 0; + cache_ptr->cache_flush_moves[i] = 0; cache_ptr->pins[i] = 0; cache_ptr->unpins[i] = 0; cache_ptr->dirty_pins[i] = 0; @@ -7089,7 +7047,7 @@ done: * Modifications: * * To support the fractal heap, the cache must now deal with - * entries being dirtied, resized, and/or renamed inside + * entries being dirtied, resized, and/or moved inside * flush callbacks. Updated function to support this. * * -- JRM 8/27/06 @@ -7174,14 +7132,14 @@ H5C_flush_invalidate_cache(const H5F_t * f, * 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 + * Since the fractal heap can dirty, resize, and/or move 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 * 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 moved * 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 * the cache entries in increasing address order. @@ -7248,7 +7206,7 @@ H5C_flush_invalidate_cache(const H5F_t * f, initial_slist_size = cache_ptr->slist_size; /* There is also the possibility that entries will be - * dirtied, resized, and/or renamed as the result of + * dirtied, resized, and/or moved as the result of * calls to the flush callbacks. We use the slist_len_increase * and slist_size_increase increase fields in struct H5C_t * to track these changes for purpose of sanity checking. @@ -7678,7 +7636,7 @@ done: * * 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 + * whether the entry has been resized or moved. 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. @@ -7874,8 +7832,8 @@ H5C_flush_single_entry(const H5F_t * f, * once rather than remove the entries one by one, so we only delete * 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 H5C_rename_entry() if we + * Note that it is possible that the entry will be moved during + * its call to flush. This will upset H5C_move_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. @@ -8115,7 +8073,7 @@ H5C_flush_single_entry(const H5F_t * f, { /* Check for unexpected flags from serialize callback */ - if(serialize_flags & ~(H5C__SERIALIZE_RESIZED_FLAG | H5C__SERIALIZE_RENAMED_FLAG)) + if(serialize_flags & ~(H5C__SERIALIZE_RESIZED_FLAG | H5C__SERIALIZE_MOVED_FLAG)) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unknown serialize flag(s)") if ( destroy ) @@ -8123,12 +8081,12 @@ H5C_flush_single_entry(const H5F_t * f, if ( cache_ptr->mdj_enabled ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "rename/resize on destroy when journaling enabled.") + "move/resize on destroy when journaling enabled.") } /* 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 + * them for the re-size and/or move. 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. @@ -8143,9 +8101,9 @@ H5C_flush_single_entry(const H5F_t * f, entry_ptr, \ new_len) - /* Check for resize+rename */ - if(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) { - H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \ + /* Check for resize+move */ + if(serialize_flags & H5C__SERIALIZE_MOVED_FLAG) { + H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, \ entry_ptr) entry_ptr->addr = new_addr; } /* end if */ @@ -8154,9 +8112,9 @@ H5C_flush_single_entry(const H5F_t * f, entry_ptr->image_ptr = new_image_ptr; } /* end if */ else { - HDassert(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG); + HDassert(serialize_flags & H5C__SERIALIZE_MOVED_FLAG); - H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \ + H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, \ entry_ptr) entry_ptr->addr = new_addr; } /* end else */ @@ -8166,14 +8124,14 @@ H5C_flush_single_entry(const H5F_t * f, if ( cache_ptr->mdj_enabled ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "rename/resize on flush when journaling enabled."); + "move/resize on flush when journaling enabled."); } /* The entry is not being destroyed, and thus has not * been removed from the cache's data structures. * * Thus, in addition to updating the entry for the - * re-size and/or rename, we must also update the + * re-size and/or move, we must also update the * cache data structures. */ @@ -8190,12 +8148,12 @@ H5C_flush_single_entry(const H5F_t * f, */ entry_ptr->is_dirty = FALSE; - /* Check for resize+rename */ - if(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) { - H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \ + /* Check for resize+move */ + if(serialize_flags & H5C__SERIALIZE_MOVED_FLAG) { + H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, \ entry_ptr) - /* update the hash table for the rename */ + /* update the hash table for the move */ H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr) entry_ptr->addr = new_addr; H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, \ @@ -8230,7 +8188,7 @@ H5C_flush_single_entry(const H5F_t * f, entry_ptr->image_ptr = new_image_ptr; } /* end if */ else { - HDassert(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG); + HDassert(serialize_flags & H5C__SERIALIZE_MOVED_FLAG); /* The replacement policy code thinks the * entry is already clean, so modify is_dirty @@ -8238,10 +8196,10 @@ H5C_flush_single_entry(const H5F_t * f, */ entry_ptr->is_dirty = FALSE; - H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \ + H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, \ entry_ptr) - /* first update the hash table for the rename */ + /* first update the hash table for the move */ H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr) entry_ptr->addr = new_addr; H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, \ @@ -8271,7 +8229,7 @@ H5C_flush_single_entry(const H5F_t * f, */ if ( serialize_flags != 0 ) { - /* In the parallel case, resizes and renames in + /* In the parallel case, resizes and moves in * the serialize operation can cause problems. * If they occur, scream and die. * @@ -8285,9 +8243,9 @@ H5C_flush_single_entry(const H5F_t * f, * change this test accordingly. * * NB: While this test detects entryies that attempt - * to resize or rename themselves during a flush + * to resize or move 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 moves * other entries during its flush. * * From what Quincey tells me, this test is @@ -8300,7 +8258,7 @@ H5C_flush_single_entry(const H5F_t * f, if ( cache_ptr->aux_ptr != NULL ) { HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \ - "resize/rename in serialize occured in parallel case.") + "resize/move in serialize occured in parallel case.") } } diff --git a/src/H5Cjournal.c b/src/H5Cjournal.c index 239339a..c3157d3 100644 --- a/src/H5Cjournal.c +++ b/src/H5Cjournal.c @@ -1017,7 +1017,7 @@ H5C_journal_transaction(H5F_t * f, resized = (hbool_t)((serialize_flags & H5C__SERIALIZE_RESIZED_FLAG) != 0); renamed = - (hbool_t)((serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) != 0); + (hbool_t)((serialize_flags & H5C__SERIALIZE_MOVED_FLAG) != 0); if ( ( renamed ) && ( ! resized ) ) { @@ -1058,13 +1058,13 @@ H5C_journal_transaction(H5F_t * f, if ( renamed ) { - result = H5C_rename_entry(cache_ptr, entry_ptr->type, + result = H5C_move_entry(cache_ptr, entry_ptr->type, entry_ptr->addr, new_addr); if ( result < 0 ) { HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \ - "H5C_rename_entr() failed.") + "H5C_move_entry() failed.") } } } diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h index ee0b108..a000a69 100644 --- a/src/H5Cpkg.h +++ b/src/H5Cpkg.h @@ -442,7 +442,7 @@ struct H5C_jbrb_t /* With the introduction of the fractal heap, it is now possible for - * entries to be dirtied, resized, and/or renamed in the flush callbacks. + * entries to be dirtied, resized, and/or moved 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. @@ -683,7 +683,7 @@ typedef struct H5C_mdjsc_record_t * some optimizations when I get to it. * * With the addition of the fractal heap, the cache must now deal with - * the case in which entries may be dirtied, renamed, or have their sizes + * the case in which entries may be dirtied, moved, or have their sizes * changed during a flush. To allow sanity checks in this situation, the * following two fields have been added. They are only compiled in when * H5C_DO_SANITY_CHECKS is TRUE. @@ -1217,19 +1217,19 @@ typedef struct H5C_mdjsc_record_t * equal to the array index has been evicted from the cache in * the current epoch. * - * renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The cells + * moves: 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 in the current + * id equal to the array index has been moved in the current * epoch. * - * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. + * entry_flush_moves: 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 + * with type id equal to the array index has been moved * during its flush callback in the current epoch. * - * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. + * cache_flush_moves: 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 + * with type id equal to the array index has been moved * during a cache flush in the current epoch. * * pins: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1. The cells @@ -1510,9 +1510,9 @@ struct H5C_t int64_t clears[H5C__MAX_NUM_TYPE_IDS + 1]; int64_t flushes[H5C__MAX_NUM_TYPE_IDS + 1]; int64_t evictions[H5C__MAX_NUM_TYPE_IDS + 1]; - int64_t renames[H5C__MAX_NUM_TYPE_IDS + 1]; - int64_t entry_flush_renames[H5C__MAX_NUM_TYPE_IDS + 1]; - int64_t cache_flush_renames[H5C__MAX_NUM_TYPE_IDS + 1]; + int64_t moves[H5C__MAX_NUM_TYPE_IDS + 1]; + int64_t entry_flush_moves[H5C__MAX_NUM_TYPE_IDS + 1]; + int64_t cache_flush_moves[H5C__MAX_NUM_TYPE_IDS + 1]; int64_t pins[H5C__MAX_NUM_TYPE_IDS + 1]; int64_t unpins[H5C__MAX_NUM_TYPE_IDS + 1]; int64_t dirty_pins[H5C__MAX_NUM_TYPE_IDS + 1]; @@ -2177,14 +2177,14 @@ if ( ( (entry_ptr) == NULL ) || \ if ( (cache_ptr)->pel_size > (cache_ptr)->max_pel_size ) \ (cache_ptr)->max_pel_size = (cache_ptr)->pel_size; -#define H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr) \ +#define H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr) \ if ( cache_ptr->flush_in_progress ) { \ - ((cache_ptr)->cache_flush_renames[(entry_ptr)->type->id])++; \ + ((cache_ptr)->cache_flush_moves[(entry_ptr)->type->id])++; \ } \ if ( entry_ptr->flush_in_progress ) { \ - ((cache_ptr)->entry_flush_renames[(entry_ptr)->type->id])++; \ + ((cache_ptr)->entry_flush_moves[(entry_ptr)->type->id])++; \ } \ - (((cache_ptr)->renames)[(entry_ptr)->type->id])++; + (((cache_ptr)->moves)[(entry_ptr)->type->id])++; #define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)\ if ( cache_ptr->flush_in_progress ) { \ @@ -2417,7 +2417,7 @@ if ( ( (entry_ptr) == NULL ) || \ #define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr) #define H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr) #define H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr) -#define H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr) +#define H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr) #define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size) #define H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) #define H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) @@ -2735,7 +2735,7 @@ if ( ( (cache_ptr) == NULL ) || \ * 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 + * able to dirty, resize and/or move entries during the * flush. * *------------------------------------------------------------------------- @@ -2874,7 +2874,7 @@ if ( ( (cache_ptr) == NULL ) || \ * 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 + * able to dirty, resize and/or move entries during the * flush. * *------------------------------------------------------------------------- @@ -3927,10 +3927,10 @@ if ( ( (cache_ptr) == NULL ) || \ /*------------------------------------------------------------------------- * - * Macro: H5C__UPDATE_RP_FOR_RENAME + * Macro: H5C__UPDATE_RP_FOR_MOVE * * Purpose: Update the replacement policy data structures for a - * rename of the specified cache entry. + * move of the specified cache entry. * * At present, we only support the modified LRU policy, so * this function deals with that case unconditionally. If @@ -3941,55 +3941,12 @@ if ( ( (cache_ptr) == NULL ) || \ * * Programmer: John Mainzer, 5/17/04 * - * Modifications: - * - * JRM - 7/27/04 - * Converted the function H5C_update_rp_for_rename() to the - * macro H5C__UPDATE_RP_FOR_RENAME in an effort to squeeze - * a bit more performance out of the cache. - * - * At least for the first cut, I am leaving the comments and - * white space in the macro. If they cause dificulties with - * pre-processor, I'll have to remove them. - * - * JRM - 7/28/04 - * Split macro into two version, one supporting the clean and - * dirty LRU lists, and the other not. Yet another attempt - * at optimization. - * - * JRM - 6/23/05 - * Added the was_dirty parameter. It is possible that - * the entry was clean when it was renamed -- if so it - * it is in the clean LRU regardless of the current - * value of the is_dirty field. - * - * At present, all renamed entries are forced to be - * dirty. This macro is a bit more general that that, - * to allow it to function correctly should that policy - * be relaxed in the future. - * - * JRM - 3/17/06 - * Modified macro to do nothing if the entry is pinned. - * In this case, the entry is on the pinned entry list, not - * in the replacement policy data structures, so there is - * nothing to be done. - * - * JRM - 3/28/07 - * Added sanity checks using the new is_read_only and - * ro_ref_count fields of struct H5C_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. - * *------------------------------------------------------------------------- */ #if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS -#define H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, \ +#define H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, \ had_jwip, fail_val) \ { \ HDassert( (cache_ptr) ); \ @@ -4104,11 +4061,11 @@ if ( ( (cache_ptr) == NULL ) || \ /* End modified LRU specific code. */ \ } \ } \ -} /* H5C__UPDATE_RP_FOR_RENAME */ +} /* H5C__UPDATE_RP_FOR_MOVE */ #else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ -#define H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, \ +#define H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, \ had_jwip, fail_val) \ { \ HDassert( (cache_ptr) ); \ @@ -4179,7 +4136,7 @@ if ( ( (cache_ptr) == NULL ) || \ /* End modified LRU specific code. */ \ } \ } \ -} /* H5C__UPDATE_RP_FOR_RENAME */ +} /* H5C__UPDATE_RP_FOR_MOVE */ #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h index c323e04..47cc0c6 100644 --- a/src/H5Cprivate.h +++ b/src/H5Cprivate.h @@ -214,7 +214,7 @@ typedef struct H5C_t H5C_t; * 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 + * this happened on a flush, and occasioned a move in the midst * of the flush. To avoid this in H5C, the serialize callback * will return the new base address, length, and image pointer to * the caller when necessary. The caller must then update the @@ -274,28 +274,28 @@ typedef struct H5C_t H5C_t; * 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, + * indicating whether the resize function resized or moved + * the entry. If the entry was neither resized or moved, * the serialize function must set *flags_ptr to zero. - * H5C__SERIALIZE_RESIZED_FLAG and H5C__SERIALIZE_RENAMED_FLAG - * must be set to indicate a resize and a rename respectively. + * H5C__SERIALIZE_RESIZED_FLAG and H5C__SERIALIZE_MOVED_FLAG + * must be set to indicate a resize and a move respectively. * * If the H5C__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 H5C__SERIALIZE_RENAMED_FLAG flag is also set, the + * If the H5C__SERIALIZE_MOVED_FLAG flag is also set, the * new image base address must be stored in *new_addr_ptr. - * Observe that the H5C__SERIALIZE_RENAMED_FLAG must not + * Observe that the H5C__SERIALIZE_MOVED_FLAG must not * appear without the H5C__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 + * new_addr_ptr: Pointer to haddr_t. If the entry is moved by * the serialize function, the new on disk base address must - * be stored in *new_addr_ptr. If the entry is not renamed + * be stored in *new_addr_ptr. If the entry is not moved * by the serialize function, *new_addr_ptr is undefined. * * new_len_ptr: Pointer to size_t. If the entry is resized by the @@ -328,7 +328,7 @@ typedef struct H5C_t H5C_t; * * 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 H5C__SERIALIZE_RENAMED_FLAG + * to the new base address, and set the H5C__SERIALIZE_MOVED_FLAG * in *flags_ptr. * * If it is successful, the function must return SUCCEED. @@ -380,7 +380,7 @@ typedef herr_t (*H5C_image_len_func_t)(const void *thing, size_t *image_len_ptr); #define H5C__SERIALIZE_RESIZED_FLAG 0x1 -#define H5C__SERIALIZE_RENAMED_FLAG 0x2 +#define H5C__SERIALIZE_MOVED_FLAG 0x2 typedef herr_t (*H5C_serialize_func_t)(const H5F_t *f, hid_t dxpl_id, @@ -1401,7 +1401,7 @@ H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t * f, H5_DLL herr_t H5C_mark_entry_dirty(void *thing); -H5_DLL herr_t H5C_rename_entry(H5C_t * cache_ptr, +H5_DLL herr_t H5C_move_entry(H5C_t * cache_ptr, const H5C_class_t * type, haddr_t old_addr, haddr_t new_addr); diff --git a/src/H5Edefin.h b/src/H5Edefin.h index f63eee8..8bc4008 100644 --- a/src/H5Edefin.h +++ b/src/H5Edefin.h @@ -109,6 +109,7 @@ hid_t H5E_CANTDELETE_g = FAIL; /* Can't delete message */ hid_t H5E_BADITER_g = FAIL; /* Iteration failed */ hid_t H5E_CANTPACK_g = FAIL; /* Can't pack messages */ hid_t H5E_CANTRESET_g = FAIL; /* Can't reset object */ +hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename object */ /* System level errors */ hid_t H5E_SYSERRSTR_g = FAIL; /* System error message */ @@ -157,7 +158,6 @@ hid_t H5E_PROTECT_g = FAIL; /* Protected metadata error */ hid_t H5E_NOTCACHED_g = FAIL; /* Metadata not currently cached */ hid_t H5E_SYSTEM_g = FAIL; /* Internal error detected */ hid_t H5E_CANTINS_g = FAIL; /* Unable to insert metadata into cache */ -hid_t H5E_CANTRENAME_g = FAIL; /* Unable to rename metadata */ hid_t H5E_CANTPROTECT_g = FAIL; /* Unable to protect metadata */ hid_t H5E_CANTUNPROTECT_g = FAIL; /* Unable to unprotect metadata */ hid_t H5E_CANTPIN_g = FAIL; /* Unable to pin cache entry */ @@ -172,7 +172,7 @@ hid_t H5E_CANTJOURNAL_g = FAIL; /* Unable to write to journal file */ hid_t H5E_TRAVERSE_g = FAIL; /* Link traversal failure */ hid_t H5E_NLINKS_g = FAIL; /* Too many soft links in path */ hid_t H5E_NOTREGISTERED_g = FAIL; /* Link class not registered */ -hid_t H5E_CANTMOVE_g = FAIL; /* Move callback returned error */ +hid_t H5E_CANTMOVE_g = FAIL; /* Can't move object */ hid_t H5E_CANTSORT_g = FAIL; /* Can't sort objects */ /* Parallel MPI errors */ diff --git a/src/H5Einit.h b/src/H5Einit.h index 4d5704f..2db5365 100644 --- a/src/H5Einit.h +++ b/src/H5Einit.h @@ -403,6 +403,11 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't reset object"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_CANTRESET_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") +assert(H5E_CANTRENAME_g==(-1)); +if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename object"))==NULL) + HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") +if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg))<0) + HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") /* System level errors */ assert(H5E_SYSERRSTR_g==(-1)); @@ -587,11 +592,6 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert metadata into cache") HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_CANTINS_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") -assert(H5E_CANTRENAME_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to rename metadata"))==NULL) - HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") -if((H5E_CANTRENAME_g = H5I_register(H5I_ERROR_MSG, msg))<0) - HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") assert(H5E_CANTPROTECT_g==(-1)); if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to protect metadata"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") @@ -655,7 +655,7 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL) if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") assert(H5E_CANTMOVE_g==(-1)); -if((msg = H5E_create_msg(cls, H5E_MINOR, "Move callback returned error"))==NULL) +if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move object"))==NULL) HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed") if((H5E_CANTMOVE_g = H5I_register(H5I_ERROR_MSG, msg))<0) HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message") diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h index 51a5d16..4c25cdf 100644 --- a/src/H5Epubgen.h +++ b/src/H5Epubgen.h @@ -178,6 +178,7 @@ H5_DLLVAR hid_t H5E_CANTSHRINK_g; /* Can't shrink container */ #define H5E_BADITER (H5OPEN H5E_BADITER_g) #define H5E_CANTPACK (H5OPEN H5E_CANTPACK_g) #define H5E_CANTRESET (H5OPEN H5E_CANTRESET_g) +#define H5E_CANTRENAME (H5OPEN H5E_CANTRENAME_g) H5_DLLVAR hid_t H5E_LINKCOUNT_g; /* Bad object header link count */ H5_DLLVAR hid_t H5E_VERSION_g; /* Wrong version number */ H5_DLLVAR hid_t H5E_ALIGNMENT_g; /* Alignment error */ @@ -186,6 +187,7 @@ H5_DLLVAR hid_t H5E_CANTDELETE_g; /* Can't delete message */ H5_DLLVAR hid_t H5E_BADITER_g; /* Iteration failed */ H5_DLLVAR hid_t H5E_CANTPACK_g; /* Can't pack messages */ H5_DLLVAR hid_t H5E_CANTRESET_g; /* Can't reset object */ +H5_DLLVAR hid_t H5E_CANTRENAME_g; /* Unable to rename object */ /* System level errors */ #define H5E_SYSERRSTR (H5OPEN H5E_SYSERRSTR_g) @@ -261,7 +263,6 @@ H5_DLLVAR hid_t H5E_NOIDS_g; /* Out of IDs for group */ #define H5E_NOTCACHED (H5OPEN H5E_NOTCACHED_g) #define H5E_SYSTEM (H5OPEN H5E_SYSTEM_g) #define H5E_CANTINS (H5OPEN H5E_CANTINS_g) -#define H5E_CANTRENAME (H5OPEN H5E_CANTRENAME_g) #define H5E_CANTPROTECT (H5OPEN H5E_CANTPROTECT_g) #define H5E_CANTUNPROTECT (H5OPEN H5E_CANTUNPROTECT_g) #define H5E_CANTPIN (H5OPEN H5E_CANTPIN_g) @@ -278,7 +279,6 @@ H5_DLLVAR hid_t H5E_PROTECT_g; /* Protected metadata error */ H5_DLLVAR hid_t H5E_NOTCACHED_g; /* Metadata not currently cached */ H5_DLLVAR hid_t H5E_SYSTEM_g; /* Internal error detected */ H5_DLLVAR hid_t H5E_CANTINS_g; /* Unable to insert metadata into cache */ -H5_DLLVAR hid_t H5E_CANTRENAME_g; /* Unable to rename metadata */ H5_DLLVAR hid_t H5E_CANTPROTECT_g; /* Unable to protect metadata */ H5_DLLVAR hid_t H5E_CANTUNPROTECT_g; /* Unable to unprotect metadata */ H5_DLLVAR hid_t H5E_CANTPIN_g; /* Unable to pin cache entry */ @@ -298,7 +298,7 @@ H5_DLLVAR hid_t H5E_CANTJOURNAL_g; /* Unable to write to journal file */ H5_DLLVAR hid_t H5E_TRAVERSE_g; /* Link traversal failure */ H5_DLLVAR hid_t H5E_NLINKS_g; /* Too many soft links in path */ H5_DLLVAR hid_t H5E_NOTREGISTERED_g; /* Link class not registered */ -H5_DLLVAR hid_t H5E_CANTMOVE_g; /* Move callback returned error */ +H5_DLLVAR hid_t H5E_CANTMOVE_g; /* Can't move object */ H5_DLLVAR hid_t H5E_CANTSORT_g; /* Can't sort objects */ /* Parallel MPI errors */ diff --git a/src/H5Eterm.h b/src/H5Eterm.h index bc4e8a7..6874758 100644 --- a/src/H5Eterm.h +++ b/src/H5Eterm.h @@ -110,7 +110,8 @@ H5E_BADMESG_g= H5E_CANTDELETE_g= H5E_BADITER_g= H5E_CANTPACK_g= -H5E_CANTRESET_g= +H5E_CANTRESET_g= +H5E_CANTRENAME_g= /* System level errors */ H5E_SYSERRSTR_g= @@ -159,7 +160,6 @@ H5E_PROTECT_g= H5E_NOTCACHED_g= H5E_SYSTEM_g= H5E_CANTINS_g= -H5E_CANTRENAME_g= H5E_CANTPROTECT_g= H5E_CANTUNPROTECT_g= H5E_CANTPIN_g= diff --git a/src/H5FSsection.c b/src/H5FSsection.c index e53fa0c..618fb0e 100644 --- a/src/H5FSsection.c +++ b/src/H5FSsection.c @@ -1377,8 +1377,8 @@ HDfprintf(stderr, "%s: old_addr = %a, fspace->sect_addr = %a\n", FUNC, old_addr, /* Move object in cache, if it actually was relocated */ if(H5F_addr_ne(fspace->sect_addr, old_addr)) { - if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0) - HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info") + if(H5AC_move_entry(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0) + HGOTO_ERROR(H5E_FSPACE, H5E_CANTMOVE, FAIL, "unable to move free space section info") } /* end if */ else { /* Mark free space section as dirty */ @@ -1442,8 +1442,8 @@ HDfprintf(stderr, "%s: Allocating space for smaller serialized sections, new_siz /* Move object in cache, if it actually was relocated */ if(H5F_addr_ne(fspace->sect_addr, old_addr)) { - if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0) - HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info") + if(H5AC_move_entry(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0) + HGOTO_ERROR(H5E_FSPACE, H5E_CANTMOVE, FAIL, "unable to move free space section info") } /* end if */ else { /* Mark free space section as dirty */ diff --git a/src/H5HFcache.c b/src/H5HFcache.c index ece70bb..e20ee87 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -1266,7 +1266,7 @@ H5HF_cache_dblock_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, /* Let the metadata cache know, if the block moved */ if(!H5F_addr_eq(hdr->man_dtable.table_addr, addr)) { - *flags |= H5AC__SERIALIZE_RENAMED_FLAG; + *flags |= H5AC__SERIALIZE_MOVED_FLAG; *new_addr = addr; } /* end if */ @@ -1319,7 +1319,7 @@ H5HF_cache_dblock_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, /* Let the metadata cache know, if the block moved */ if(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr)) { - *flags |= H5AC__SERIALIZE_RENAMED_FLAG; + *flags |= H5AC__SERIALIZE_MOVED_FLAG; *new_addr = addr; } /* end if */ diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index 9013c0c..c8d02af 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -565,8 +565,8 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si /* Move object in cache, if it actually was relocated */ if(H5F_addr_ne(iblock->addr, new_addr)) { - if(H5AC_rename(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move fractal heap root indirect block") + if(H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0) + HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move fractal heap root indirect block") iblock->addr = new_addr; } /* end if */ @@ -724,7 +724,7 @@ H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id) /* Move object in cache, if it actually was relocated */ if(H5F_addr_ne(iblock->addr, new_addr)) { - if(H5AC_rename(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0) + if(H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block") iblock->addr = new_addr; } /* end if */ @@ -286,8 +286,8 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size) HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap data block in cache") /* Relocate the heap data block in the cache */ - if(H5AC_rename(f, H5AC_LHEAP_DBLK, old_addr, new_addr) < 0) - HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move heap data block in cache") + if(H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr) < 0) + HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move heap data block in cache") } /* end else */ } /* end else */ diff --git a/src/H5err.txt b/src/H5err.txt index 7b9fcb4..c407cfc 100644 --- a/src/H5err.txt +++ b/src/H5err.txt @@ -162,7 +162,6 @@ MINOR, CACHE, H5E_PROTECT, Protected metadata error MINOR, CACHE, H5E_NOTCACHED, Metadata not currently cached MINOR, CACHE, H5E_SYSTEM, Internal error detected MINOR, CACHE, H5E_CANTINS, Unable to insert metadata into cache -MINOR, CACHE, H5E_CANTRENAME, Unable to rename metadata MINOR, CACHE, H5E_CANTPROTECT, Unable to protect metadata MINOR, CACHE, H5E_CANTUNPROTECT, Unable to unprotect metadata MINOR, CACHE, H5E_CANTPIN, Unable to pin cache entry @@ -195,6 +194,7 @@ MINOR, OHDR, H5E_CANTDELETE, Can't delete message MINOR, OHDR, H5E_BADITER, Iteration failed MINOR, OHDR, H5E_CANTPACK, Can't pack messages MINOR, OHDR, H5E_CANTRESET, Can't reset object +MINOR, OHDR, H5E_CANTRENAME, Unable to rename object # Group related errors MINOR, GROUP, H5E_CANTOPENOBJ, Can't open object @@ -223,7 +223,7 @@ MINOR, PLIST, H5E_DUPCLASS, Duplicate class name in parent class MINOR, LINK, H5E_TRAVERSE, Link traversal failure MINOR, LINK, H5E_NLINKS, Too many soft links in path MINOR, LINK, H5E_NOTREGISTERED, Link class not registered -MINOR, LINK, H5E_CANTMOVE, Move callback returned error +MINOR, LINK, H5E_CANTMOVE, Can't move object MINOR, LINK, H5E_CANTSORT, Can't sort objects # Parallel MPI errors diff --git a/test/cache.c b/test/cache.c index 922fda9..790f9b4 100644 --- a/test/cache.c +++ b/test/cache.c @@ -97,9 +97,9 @@ static void check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr); static unsigned check_get_entry_status(void); static unsigned check_expunge_entry(void); static unsigned check_multiple_read_protect(void); -static unsigned check_rename_entry(void); -static void check_rename_entry__run_test(H5F_t * file_ptr, int test_num, - struct rename_entry_test_spec * spec_ptr); +static unsigned check_move_entry(void); +static void check_move_entry__run_test(H5F_t * file_ptr, int test_num, + struct move_entry_test_spec * spec_ptr); static unsigned check_pin_protected_entry(void); static unsigned check_resize_entry(void); static unsigned check_evictions_enabled(void); @@ -107,7 +107,7 @@ static unsigned check_flush_protected_err(void); static unsigned check_destroy_pinned_err(void); static unsigned check_destroy_protected_err(void); static unsigned check_duplicate_insert_err(void); -static unsigned check_rename_err(void); +static unsigned check_move_err(void); static unsigned check_double_pin_err(void); static unsigned check_double_unpin_err(void); static unsigned check_pin_entry_errs(void); @@ -135,7 +135,7 @@ static unsigned check_auto_cache_resize_aux_fcns(void); /*------------------------------------------------------------------------- * Function: smoke_check_1() * - * Purpose: A basic functional test, inserts, destroys, and renames in + * Purpose: A basic functional test, inserts, destroys, and moves in * the mix, along with repeated protects and unprotects. * All entries are marked as clean. * @@ -220,8 +220,8 @@ smoke_check_1(void) /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -240,8 +240,8 @@ smoke_check_1(void) /* display_detailed_stats */ FALSE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -260,8 +260,8 @@ smoke_check_1(void) /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -356,7 +356,7 @@ smoke_check_1(void) * Function: smoke_check_2() * * Purpose: A basic functional test, with inserts, destroys, and - * renames in the mix, along with some repeated protects + * moves in the mix, along with some repeated protects * and unprotects. About half the entries are marked as * dirty. * @@ -441,8 +441,8 @@ smoke_check_2(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -461,8 +461,8 @@ smoke_check_2(void) /* display_detailed_stats */ TRUE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -481,8 +481,8 @@ smoke_check_2(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -577,7 +577,7 @@ smoke_check_2(void) * Function: smoke_check_3() * * Purpose: A basic functional test on a tiny cache, with inserts, - * destroys, and renames in the mix, along with repeated + * destroys, and moves in the mix, along with repeated * protects and unprotects. All entries are marked as clean. * * Return: void @@ -661,8 +661,8 @@ smoke_check_3(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -681,8 +681,8 @@ smoke_check_3(void) /* display_detailed_stats */ TRUE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -701,8 +701,8 @@ smoke_check_3(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -797,7 +797,7 @@ smoke_check_3(void) * Function: smoke_check_4() * * Purpose: A basic functional test on a tiny cache, with inserts, - * destroys, and renames in the mix, along with repeated + * destroys, and moves in the mix, along with repeated * protects and unprotects. About half the entries are * marked as dirty. * @@ -882,8 +882,8 @@ smoke_check_4(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -902,8 +902,8 @@ smoke_check_4(void) /* display_detailed_stats */ TRUE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -922,8 +922,8 @@ smoke_check_4(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2055,7 +2055,7 @@ smoke_check_8(void) * part of the time. * * Recall that smoke check 1 is a basic functional test, - * with inserts, destroys, and renames in the mix, along + * with inserts, destroys, and moves in the mix, along * with repeated protects and unprotects. All entries are * marked as clean. * @@ -2159,8 +2159,8 @@ smoke_check_9(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2196,8 +2196,8 @@ smoke_check_9(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2231,8 +2231,8 @@ smoke_check_9(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2391,7 +2391,7 @@ smoke_check_9(void) * part of the time. * * Recall that smoke check 2 is a basic functional test, - * with inserts, destroys, and renames in the mix, along + * with inserts, destroys, and moves in the mix, along * with some repeated protects and unprotects. About half * the entries are marked as dirty. * @@ -2478,8 +2478,8 @@ smoke_check_10(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2513,8 +2513,8 @@ smoke_check_10(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2548,8 +2548,8 @@ smoke_check_10(void) /* display_detailed_stats */ display_detailed_stats, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -2805,8 +2805,8 @@ write_permitted_check(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ TRUE, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ TRUE, @@ -2827,8 +2827,8 @@ write_permitted_check(void) /* display_detailed_stats */ TRUE, /* do_inserts */ FALSE, /* dirty_inserts */ FALSE, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ FALSE, @@ -2849,8 +2849,8 @@ write_permitted_check(void) /* display_detailed_stats */ TRUE, /* do_inserts */ TRUE, /* dirty_inserts */ TRUE, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ TRUE, @@ -5826,7 +5826,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr, * * These are tests that test the cache's ability to handle * the case in which the flush callback dirties, resizes, - * and/or renames entries. + * and/or moves entries. * * Do nothing if pass is FALSE on entry. * @@ -6230,7 +6230,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) if ( pass ) /* test #5 & #6 */ { /* Single entry test verifying that the cache can handle the case in - * which the call back function first resizes and then renames the + * which the call back function first resizes and then moves the * entry for which it has been called. * * Run this entry twice, as the first run moves the entry to its @@ -6265,7 +6265,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* flush_ops = */ /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -6312,11 +6312,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the rename to move the target entry back to its + /* this change forces the move to move the target entry back to its * main address. The first test moved it to its alternate address. * * Note that these two tests are not the same, as in the first test, - * the renamed entry is moved forward in the slist. In the second + * the moved entry is moved forward in the slist. In the second * it is moved backwards. * * Since there is only one entry in the cache, this doesn't really @@ -6348,7 +6348,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * second test. * * Single entry test verifying that the cache can handle the case in - * which the call back function renames the entry for which it has + * which the call back function moves the entry for which it has * been called. * * Run this entry twice, as the first run moves the entry to its @@ -6383,7 +6383,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* flush_ops = */ /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -6430,11 +6430,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the rename to move the target entry back to its + /* this change forces the move to move the target entry back to its * main address. The first test moved it to its alternate address. * * Note that these two tests are not the same, as in the first test, - * the renamed entry is moved forward in the slist. In the second + * the moved entry is moved forward in the slist. In the second * it is moved backwards. * * Since there is only one entry in the cache, this doesn't really @@ -6468,7 +6468,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) if ( pass ) /* test #9 & #10 */ { /* Single entry test verifying that the cache can handle the case in - * which the call back function both resizes and renames the entry + * which the call back function both resizes and moves the entry * for which it has been called. * * Again, we run this entry twice, as the first run moves the entry @@ -6497,7 +6497,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* flush_ops = */ /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -6544,11 +6544,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the rename to move the target entry back to its + /* this change forces the move to move the target entry back to its * main address. The first test moved it to its alternate address. * * Note that these two tests are not the same, as in the first test, - * the renamed entry is moved forward in the slist. In the second + * the moved entry is moved forward in the slist. In the second * it is moved backwards. * * Since there is only one entry in the cache, this doesn't really @@ -6580,7 +6580,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * second test. * * Single entry test verifying that the cache can handle the case in - * which the call back function both resizes and renames the entry + * which the call back function both resizes and moves the entry * for which it has been called. * * Again, we run this entry twice, as the first run moves the entry to its @@ -6609,7 +6609,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* flush_ops = */ /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -6656,11 +6656,11 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the rename to move the target entry back to its + /* this change forces the move to move the target entry back to its * main address. The first test moved it to its alternate address. * * Note that these two tests are not the same, as in the first test, - * the renamed entry is moved forward in the slist. In the second + * the moved entry is moved forward in the slist. In the second * it is moved backwards. * * Since there is only one entry in the cache, this doesn't really @@ -7083,7 +7083,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) { /* Test the ability of the cache to handle the case in which * the flush function of an entry that is resident in cache - * resizes, dirties, and renames two entries that are not in cache. + * resizes, dirties, and moves two entries that are not in cache. * * At present, I am assured that this case will never occur, but * lets make sure we can handle it regardless. @@ -7114,10 +7114,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7175,12 +7175,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the renames to move the target entries back to + /* this change forces the moves to move the target entries back to * their main address. The first test moved them to their alternate * address. * * Note that these two tests are not the same, as in the first test, - * the renamed entries are moved forward in the slist. In the second + * the moved entries are moved forward in the slist. In the second * they are moved backwards. */ if ( pass ) { @@ -7212,7 +7212,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * * Test the ability of the cache to handle the case in which * the flush function of an entry that is resident in cache - * resizes, dirties, and renames two entries that are not in cache. + * resizes, dirties, and moves two entries that are not in cache. * * At present, I am assured that this case will never occur, but * lets make sure we can handle it regardless. @@ -7243,10 +7243,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7304,12 +7304,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) check_size, checks); - /* this change forces the renames to move the target entries back to + /* this change forces the moves to move the target entries back to * their main address. The first test moved them to their alternate * address. * * Note that these two tests are not the same, as in the first test, - * the renamed entries are moved forward in the slist. In the second + * the moved entries are moved forward in the slist. In the second * they are moved backwards. */ if ( pass ) { @@ -7347,7 +7347,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* Now mix things up a bit. * * Load several entries, two of which have flush functions that - * resize, dirty, and rename two entries that are not in the + * resize, dirty, and move two entries that are not in the * cache. Mark only one of these entries, and then flush the * cache with the flush marked entries flag. * @@ -7384,10 +7384,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7412,10 +7412,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7566,7 +7566,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* Mix things up some more. * * Load lots of entries, some of which have flush functions that - * resize, dirty, and rename two entries that are not in the + * resize, dirty, and move two entries that are not in the * cache. * * Also load entries that have flush ops on entries that are in @@ -7599,10 +7599,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7627,10 +7627,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7839,7 +7839,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * Mix things up some more. * * Load lots of entries, some of which have flush functions that - * resize, dirty, and rename two entries that are not in the + * resize, dirty, and move two entries that are not in the * cache. * * Also load entries that have flush ops on entries that are in @@ -7869,10 +7869,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -7897,10 +7897,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -8408,12 +8408,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * dirties (VET, 100) * resizes (VET, 200) * dirty (VET, 300) -- dirty first to bring into cache. - * renames (VET, 300) + * moves (VET, 300) * * (VET, 2000) initially clean, and in cache * dirties (VET, 2100) * resizes (VET, 2200) - * renames (VET, 2300) + * moves (VET, 2300) * * (VET, 350) initially clean, and in cache * pins (VET, 1000) @@ -8425,7 +8425,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * (VET, 450) initially dirty, and in cache * pins (VET, 1000) * dirties (VET, 1000) - * renames (VET, 450) + * moves (VET, 450) * pins (VET, 2000) * dirties (VET, 2000) * @@ -8558,7 +8558,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -8585,7 +8585,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -8845,12 +8845,12 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * dirties (VET, 100) * resizes (VET, 200) * dirty (VET, 300) -- dirty first to bring into cache. - * renames (VET, 300) + * moves (VET, 300) * * (VET, 2000) initially clean, and in cache * dirties (VET, 2100) * resizes (VET, 2200) - * renames (VET, 2300) + * moves (VET, 2300) * * (VET, 350) initially clean, and in cache * pins (VET, 1000) @@ -8862,7 +8862,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) * (VET, 450) initially dirty, and in cache * pins (VET, 1000) * dirties (VET, 1000) - * renames (VET, 450) + * moves (VET, 450) * pins (VET, 2000) * dirties (VET, 2000) * @@ -8995,7 +8995,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2 }, { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9022,7 +9022,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9300,7 +9300,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 200, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9328,7 +9328,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9384,7 +9384,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 500, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9493,7 +9493,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 200, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9521,7 +9521,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -9577,7 +9577,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr) /* op_code: type: idx: flag: size: */ { { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0 }, { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2 }, - { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 500, FALSE, 0 }, + { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, { FLUSH_OP__NO_OP, 0, 0, FALSE, 0 }, @@ -10355,7 +10355,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) * * (VET, 3) dirties (VET, 0) * resizes (VET, 0) to VARIABLE_ENTRY_SIZE - * renames (VET, 0) to its alternate address + * moves (VET, 0) to its alternate address * * (VET, 5) dirties (VET, 0) * resizes itself to VARIABLE_ENTRY_SIZE / 2 @@ -10375,7 +10375,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0); add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE); - add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__RENAME, + add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0); add_flush_op(VARIABLE_ENTRY_TYPE, 5, FLUSH_OP__DIRTY, @@ -10408,7 +10408,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) * * (VET, 3) Y 2.5 KB N N 0 dirty (VET, 0) * resize (VET, 0) to 10 KB - * rename (VET, 0) to its alternate address + * move (VET, 0) to its alternate address * * (VET, 4) Y 10 KB N N - - * @@ -10488,7 +10488,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) * * (VET, 3) Y 2.5 KB Y N 0 dirty (VET, 0) * resize (VET, 0) to 10 KB - * rename (VET, 0) to its alternate address + * move (VET, 0) to its alternate address * * (VET, 4) Y 10 KB N N - - * @@ -11325,9 +11325,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) ( cache_ptr->clears[VARIABLE_ENTRY_TYPE] != 0 ) || ( cache_ptr->flushes[VARIABLE_ENTRY_TYPE] != 19 ) || ( cache_ptr->evictions[VARIABLE_ENTRY_TYPE] != 11 ) || - ( cache_ptr->renames[VARIABLE_ENTRY_TYPE] != 1 ) || - ( cache_ptr->entry_flush_renames[VARIABLE_ENTRY_TYPE] != 0 ) || - ( cache_ptr->cache_flush_renames[VARIABLE_ENTRY_TYPE] != 0 ) || + ( cache_ptr->moves[VARIABLE_ENTRY_TYPE] != 1 ) || + ( cache_ptr->entry_flush_moves[VARIABLE_ENTRY_TYPE] != 0 ) || + ( cache_ptr->cache_flush_moves[VARIABLE_ENTRY_TYPE] != 0 ) || ( cache_ptr->pins[VARIABLE_ENTRY_TYPE] != 2 ) || ( cache_ptr->unpins[VARIABLE_ENTRY_TYPE] != 2 ) || ( cache_ptr->dirty_pins[VARIABLE_ENTRY_TYPE] != 0 ) || @@ -11350,9 +11350,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) ( cache_ptr->clears[LARGE_ENTRY_TYPE] != 0 ) || ( cache_ptr->flushes[LARGE_ENTRY_TYPE] != 38 ) || ( cache_ptr->evictions[LARGE_ENTRY_TYPE] != 14 ) || - ( cache_ptr->renames[LARGE_ENTRY_TYPE] != 0 ) || - ( cache_ptr->entry_flush_renames[LARGE_ENTRY_TYPE] != 0 ) || - ( cache_ptr->cache_flush_renames[LARGE_ENTRY_TYPE] != 0 ) || + ( cache_ptr->moves[LARGE_ENTRY_TYPE] != 0 ) || + ( cache_ptr->entry_flush_moves[LARGE_ENTRY_TYPE] != 0 ) || + ( cache_ptr->cache_flush_moves[LARGE_ENTRY_TYPE] != 0 ) || ( cache_ptr->pins[LARGE_ENTRY_TYPE] != 0 ) || ( cache_ptr->unpins[LARGE_ENTRY_TYPE] != 0 ) || ( cache_ptr->dirty_pins[LARGE_ENTRY_TYPE] != 0 ) || @@ -11375,9 +11375,9 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr) ( cache_ptr->clears[MONSTER_ENTRY_TYPE] != 0 ) || ( cache_ptr->flushes[MONSTER_ENTRY_TYPE] != 93 ) || ( cache_ptr->evictions[MONSTER_ENTRY_TYPE] != 31 ) || - ( cache_ptr->renames[MONSTER_ENTRY_TYPE] != 0 ) || - ( cache_ptr->entry_flush_renames[MONSTER_ENTRY_TYPE] != 0 ) || - ( cache_ptr->cache_flush_renames[MONSTER_ENTRY_TYPE] != 0 ) || + ( cache_ptr->moves[MONSTER_ENTRY_TYPE] != 0 ) || + ( cache_ptr->entry_flush_moves[MONSTER_ENTRY_TYPE] != 0 ) || + ( cache_ptr->cache_flush_moves[MONSTER_ENTRY_TYPE] != 0 ) || ( cache_ptr->pins[MONSTER_ENTRY_TYPE] != 0 ) || ( cache_ptr->unpins[MONSTER_ENTRY_TYPE] != 0 ) || ( cache_ptr->dirty_pins[MONSTER_ENTRY_TYPE] != 0 ) || @@ -14464,9 +14464,9 @@ check_multiple_read_protect(void) /*------------------------------------------------------------------------- - * Function: check_rename_entry() + * Function: check_move_entry() * - * Purpose: Verify that H5C_rename_entry behaves as expected. In + * Purpose: Verify that H5C_move_entry behaves as expected. In * particular, verify that it works correctly with pinned * entries. * @@ -14481,12 +14481,12 @@ check_multiple_read_protect(void) */ static unsigned -check_rename_entry(void) +check_move_entry(void) { - const char * fcn_name = "check_rename_entry"; + const char * fcn_name = "check_move_entry"; int i; H5F_t * file_ptr = NULL; - struct rename_entry_test_spec test_specs[4] = + struct move_entry_test_spec test_specs[4] = { { /* int entry_type = */ PICO_ENTRY_TYPE, @@ -14514,13 +14514,13 @@ check_rename_entry(void) } }; - TESTING("H5C_rename_entry() functionality"); + TESTING("H5C_move_entry() functionality"); core_file_driver_failed = FALSE; pass = TRUE; - /* allocate a cache, load entries into it, and then rename + /* allocate a cache, load entries into it, and then move * them. To the extent possible, verify that the desired * actions took place. * @@ -14556,7 +14556,7 @@ check_rename_entry(void) i = 0; while ( ( pass ) && ( i < 4 ) ) { - check_rename_entry__run_test(file_ptr, i, &(test_specs[i])); + check_move_entry__run_test(file_ptr, i, &(test_specs[i])); i++; } @@ -14582,13 +14582,13 @@ check_rename_entry(void) return !pass; -} /* check_rename_entry() */ +} /* check_move_entry() */ /*------------------------------------------------------------------------- - * Function: check_rename_entry__run_test() + * Function: check_move_entry__run_test() * - * Purpose: Run a rename entry test. + * Purpose: Run a move entry test. * * Do nothing if pass is FALSE on entry. * @@ -14605,11 +14605,11 @@ check_rename_entry(void) */ static void -check_rename_entry__run_test(H5F_t * file_ptr, +check_move_entry__run_test(H5F_t * file_ptr, int test_num, - struct rename_entry_test_spec * spec_ptr) + struct move_entry_test_spec * spec_ptr) { - /* const char * fcn_name = "check_rename_entry__run_test"; */ + /* const char * fcn_name = "check_move_entry__run_test"; */ H5C_t * cache_ptr = file_ptr->shared->cache; static char msg[128]; unsigned int flags = H5C__NO_FLAGS_SET; @@ -14621,7 +14621,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "cache_ptr NULL on entry to rename test #%d.", + "cache_ptr NULL on entry to move test #%d.", test_num); failure_mssg = msg; @@ -14629,7 +14629,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "spec_ptr NULL on entry to rename test #%d.", + "spec_ptr NULL on entry to move test #%d.", test_num); failure_mssg = msg; @@ -14648,7 +14648,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "bad entry_ptr in rename test #%d.", + "bad entry_ptr in move test #%d.", test_num); failure_mssg = msg; @@ -14663,13 +14663,13 @@ check_rename_entry__run_test(H5F_t * file_ptr, unprotect_entry(file_ptr, spec_ptr->entry_type, spec_ptr->entry_index, (int)(spec_ptr->is_dirty), flags); - rename_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE); + move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, FALSE); if ( pass ) { - /* verify that the rename took place, and that the cache's internal + /* verify that the move took place, and that the cache's internal * structures are as expected. Note that some sanity checking is - * done by rename_entry(), so we don't have to repeat it here. + * done by move_entry(), so we don't have to repeat it here. */ if ( spec_ptr->is_pinned ) { @@ -14678,7 +14678,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "Pinned entry not pinned after rename in test #%d.", + "Pinned entry not pinned after move in test #%d.", test_num); failure_mssg = msg; } @@ -14697,7 +14697,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "Pinned entry not in pel after rename in test #%d.", + "Pinned entry not in pel after move in test #%d.", test_num); failure_mssg = msg; } @@ -14711,7 +14711,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, pass = FALSE; HDsnprintf(msg, (size_t)128, - "Unpinned entry pinned after rename in test #%d.", + "Unpinned entry pinned after move in test #%d.", test_num); failure_mssg = msg; } @@ -14721,7 +14721,7 @@ check_rename_entry__run_test(H5F_t * file_ptr, { pass = FALSE; HDsnprintf(msg, (size_t)128, - "Entry not at head of LRU after rename in test #%d.", + "Entry not at head of LRU after move in test #%d.", test_num); failure_mssg = msg; } @@ -14729,11 +14729,11 @@ check_rename_entry__run_test(H5F_t * file_ptr, } /* put the entry back where it started from */ - rename_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE); + move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE); return; -} /* check_rename_entry__run_test() */ +} /* check_move_entry__run_test() */ /*------------------------------------------------------------------------- @@ -16883,9 +16883,9 @@ check_duplicate_insert_err(void) /*------------------------------------------------------------------------- - * Function: check_rename_err() + * Function: check_move_err() * - * Purpose: Verify that an attempt to rename an entry to the address + * Purpose: Verify that an attempt to move an entry to the address * of an existing entry will generate an error. * * Return: void @@ -16899,9 +16899,9 @@ check_duplicate_insert_err(void) */ static unsigned -check_rename_err(void) +check_move_err(void) { - const char * fcn_name = "check_rename_err()"; + const char * fcn_name = "check_move_err()"; herr_t result; H5F_t * file_ptr = NULL; H5C_t * cache_ptr = NULL; @@ -16909,13 +16909,13 @@ check_rename_err(void) test_entry_t * entry_0_1_ptr; test_entry_t * entry_1_0_ptr; - TESTING("rename to existing entry errors"); + TESTING("move to existing entry errors"); core_file_driver_failed = FALSE; pass = TRUE; - /* allocate a cache, and insert several entries. Try to rename + /* allocate a cache, and insert several entries. Try to move * entries to other entries resident in the cache. This should * fail. Destroy the cache -- should succeed. */ @@ -16939,25 +16939,25 @@ check_rename_err(void) if ( pass ) { - result = H5C_rename_entry(cache_ptr, &(types[0]), + result = H5C_move_entry(cache_ptr, &(types[0]), entry_0_0_ptr->addr, entry_0_1_ptr->addr); if ( result >= 0 ) { pass = FALSE; - failure_mssg = "rename to addr of same type succeeded.\n"; + failure_mssg = "move to addr of same type succeeded.\n"; } } if ( pass ) { - result = H5C_rename_entry(cache_ptr, &(types[0]), + result = H5C_move_entry(cache_ptr, &(types[0]), entry_0_0_ptr->addr, entry_1_0_ptr->addr); if ( result >= 0 ) { pass = FALSE; - failure_mssg = "rename to addr of different type succeeded.\n"; + failure_mssg = "move to addr of different type succeeded.\n"; } } @@ -16983,7 +16983,7 @@ check_rename_err(void) return !pass; -} /* check_rename_err() */ +} /* check_move_err() */ /*------------------------------------------------------------------------- @@ -29234,7 +29234,7 @@ main(void) nerrs += check_get_entry_status(); nerrs += check_expunge_entry(); nerrs += check_multiple_read_protect(); - nerrs += check_rename_entry(); + nerrs += check_move_entry(); nerrs += check_pin_protected_entry(); nerrs += check_resize_entry(); nerrs += check_evictions_enabled(); @@ -29242,7 +29242,7 @@ main(void) nerrs += check_destroy_pinned_err(); nerrs += check_destroy_protected_err(); nerrs += check_duplicate_insert_err(); - nerrs += check_rename_err(); + nerrs += check_move_err(); nerrs += check_double_pin_err(); nerrs += check_double_unpin_err(); nerrs += check_pin_entry_errs(); diff --git a/test/cache_common.c b/test/cache_common.c index 82752ad..e705b7a 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -835,7 +835,7 @@ serialize(haddr_t addr, size_t len, void * image_ptr, void * thing, } } - if ( ((*flags_ptr) & H5C__SERIALIZE_RENAMED_FLAG) != 0 ) { + if ( ((*flags_ptr) & H5C__SERIALIZE_MOVED_FLAG) != 0 ) { HDassert( ((*flags_ptr) | H5C__SERIALIZE_RESIZED_FLAG) != 0 ); @@ -1495,7 +1495,7 @@ execute_flush_op(H5F_t * file_ptr, } break; - case FLUSH_OP__RENAME: + case FLUSH_OP__MOVE: if ( ( entry_ptr->type == op_ptr->type ) && ( entry_ptr->index == op_ptr->idx ) ) { @@ -1506,7 +1506,7 @@ execute_flush_op(H5F_t * file_ptr, HDassert( ((*flags_ptr) & H5C__SERIALIZE_RESIZED_FLAG) != 0 ); - (*flags_ptr) |= H5C__SERIALIZE_RENAMED_FLAG; + (*flags_ptr) |= H5C__SERIALIZE_MOVED_FLAG; if ( op_ptr->flag ) { @@ -1524,7 +1524,7 @@ execute_flush_op(H5F_t * file_ptr, } else { - rename_entry(cache_ptr, op_ptr->type, op_ptr->idx, + move_entry(cache_ptr, op_ptr->type, op_ptr->idx, op_ptr->flag); } break; @@ -3038,9 +3038,9 @@ mark_entry_dirty(H5F_t * file_ptr, /*------------------------------------------------------------------------- - * Function: rename_entry() + * Function: move_entry() * - * Purpose: Rename the entry indicated by the type and index to its + * Purpose: Move the entry indicated by the type and index to its * main or alternate address as indicated. If the entry is * already at the desired entry, do nothing. * @@ -3053,7 +3053,7 @@ mark_entry_dirty(H5F_t * file_ptr, */ void -rename_entry(H5C_t * cache_ptr, +move_entry(H5C_t * cache_ptr, int32_t type, int32_t idx, hbool_t main_addr) @@ -3084,7 +3084,7 @@ rename_entry(H5C_t * cache_ptr, if ( entry_ptr->at_main_addr && !main_addr ) { - /* rename to alt addr */ + /* move to alt addr */ HDassert( entry_ptr->addr == entry_ptr->main_addr ); @@ -3094,7 +3094,7 @@ rename_entry(H5C_t * cache_ptr, } else if ( !(entry_ptr->at_main_addr) && main_addr ) { - /* rename to main addr */ + /* move to main addr */ HDassert( entry_ptr->addr == entry_ptr->alt_addr ); @@ -3107,7 +3107,7 @@ rename_entry(H5C_t * cache_ptr, entry_ptr->is_dirty = TRUE; - result = H5C_rename_entry(cache_ptr, &(types[type]), + result = H5C_move_entry(cache_ptr, &(types[type]), old_addr, new_addr); } @@ -3118,7 +3118,7 @@ rename_entry(H5C_t * cache_ptr, ( entry_ptr->header.addr != new_addr ) ) ) { pass = FALSE; - failure_mssg = "error in H5C_rename_entry()."; + failure_mssg = "error in H5C_move_entry()."; } else { @@ -3135,7 +3135,7 @@ rename_entry(H5C_t * cache_ptr, return; -} /* rename_entry() */ +} /* move_entry() */ /*------------------------------------------------------------------------- @@ -3793,7 +3793,7 @@ unprotect_entry_with_size_change(H5F_t * file_ptr, /*------------------------------------------------------------------------- * Function: row_major_scan_forward() * - * Purpose: Do a sequence of inserts, protects, unprotects, renames, + * Purpose: Do a sequence of inserts, protects, unprotects, moves, * destroys while scanning through the set of entries. If * pass is false on entry, do nothing. * @@ -3815,8 +3815,8 @@ row_major_scan_forward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -3893,16 +3893,16 @@ row_major_scan_forward(H5F_t * file_ptr, } - if ( ( pass ) && ( do_renames ) && ( (idx + lag - 2) >= 0 ) && + if ( ( pass ) && ( do_moves ) && ( (idx + lag - 2) >= 0 ) && ( (idx + lag - 2) <= local_max_index ) && ( ( (idx + lag - 2) % 3 ) == 0 ) ) { if ( verbose ) HDfprintf(stdout, "4(r, %d, %d, %d) ", - type, (idx + lag - 2), (int)rename_to_main_addr); + type, (idx + lag - 2), (int)move_to_main_addr); - rename_entry(cache_ptr, type, (idx + lag - 2), - rename_to_main_addr); + move_entry(cache_ptr, type, (idx + lag - 2), + move_to_main_addr); } @@ -4249,7 +4249,7 @@ hl_row_major_scan_forward(H5F_t * file_ptr, /*------------------------------------------------------------------------- * Function: row_major_scan_backward() * - * Purpose: Do a sequence of inserts, protects, unprotects, renames, + * Purpose: Do a sequence of inserts, protects, unprotects, moves, * destroys while scanning backwards through the set of * entries. If pass is false on entry, do nothing. * @@ -4271,8 +4271,8 @@ row_major_scan_backward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -4347,17 +4347,17 @@ row_major_scan_backward(H5F_t * file_ptr, } - if ( ( pass ) && ( do_renames ) && ( (idx - lag + 2) >= 0 ) && + if ( ( pass ) && ( do_moves ) && ( (idx - lag + 2) >= 0 ) && /*( (idx - lag + 2) <= max_indices[type] ) && */ ( (idx - lag + 2) <= local_max_index ) && ( ( (idx - lag + 2) % 3 ) == 0 ) ) { if ( verbose ) HDfprintf(stdout, "(r, %d, %d, %d) ", - type, (idx + lag + 2), (int)rename_to_main_addr); + type, (idx + lag + 2), (int)move_to_main_addr); - rename_entry(cache_ptr, type, (idx - lag + 2), - rename_to_main_addr); + move_entry(cache_ptr, type, (idx - lag + 2), + move_to_main_addr); } diff --git a/test/cache_common.h b/test/cache_common.h index e748b60..841294e 100644 --- a/test/cache_common.h +++ b/test/cache_common.h @@ -130,7 +130,7 @@ #define FLUSH_OP__NO_OP 0 #define FLUSH_OP__DIRTY 1 #define FLUSH_OP__RESIZE 2 -#define FLUSH_OP__RENAME 3 +#define FLUSH_OP__MOVE 3 #define FLUSH_OP__MAX_OP 3 #define MAX_FLUSH_OPS 10 /* Maximum number of flush operations @@ -147,7 +147,7 @@ typedef struct flush_op * FLUSH_OP__NO_OP * FLUSH_OP__DIRTY * FLUSH_OP__RESIZE - * FLUSH_OP__RENAME + * FLUSH_OP__MOVE */ int type; /* type code of the cache entry that * is the target of the operation. @@ -179,12 +179,12 @@ typedef struct flush_op * H5C_mark_entry_dirty() * call. * - * FLUSH_OP__RENAME: TRUE iff the - * target is to be renamed to + * FLUSH_OP__MOVE: TRUE iff the + * target is to be moved to * its main address. */ size_t size; /* New target size in the - * FLUSH_OP__RENAME operation. + * FLUSH_OP__MOVE operation. * Unused elsewhere. */ } flush_op; @@ -234,7 +234,7 @@ typedef struct test_entry_t haddr_t main_addr; /* initial location of the entry */ haddr_t alt_addr; /* location to which the entry - * can be relocated or "renamed" + * can be relocated or "moved" */ size_t size; /* how big the cache thinks this * entry is @@ -559,7 +559,7 @@ struct fo_flush_cache_test_spec hbool_t expected_destroyed; }; -struct rename_entry_test_spec +struct move_entry_test_spec { int entry_type; int entry_index; @@ -774,7 +774,7 @@ void mark_entry_dirty(H5F_t * file_ptr, int32_t type, int32_t idx); -void rename_entry(H5C_t * cache_ptr, +void move_entry(H5C_t * cache_ptr, int32_t type, int32_t idx, hbool_t main_addr); @@ -832,8 +832,8 @@ void row_major_scan_forward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -857,8 +857,8 @@ void row_major_scan_backward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, diff --git a/test/cache_journal.c b/test/cache_journal.c index 70428b4..8dca89c 100644 --- a/test/cache_journal.c +++ b/test/cache_journal.c @@ -101,8 +101,8 @@ static void jrnl_row_major_scan_backward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -118,8 +118,8 @@ static void jrnl_row_major_scan_forward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -1016,7 +1016,7 @@ jrnl_col_major_scan_forward(H5F_t * file_ptr, /*------------------------------------------------------------------------- * Function: jrnl_row_major_scan_backward() * - * Purpose: Do a sequence of inserts, protects, unprotects, renames, + * Purpose: Do a sequence of inserts, protects, unprotects, moves, * destroys broken into transactions while scanning backwards * through the set of entries. * @@ -1047,8 +1047,8 @@ jrnl_row_major_scan_backward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -1160,7 +1160,7 @@ jrnl_row_major_scan_backward(H5F_t * file_ptr, } - if ( ( pass ) && ( do_renames ) && + if ( ( pass ) && ( do_moves ) && ( (idx - lag + 2) >= 0 ) && ( (idx - lag + 2) >= lower_bound ) && ( (idx - lag + 2) <= local_max_index ) && @@ -1170,10 +1170,10 @@ jrnl_row_major_scan_backward(H5F_t * file_ptr, if ( verbose ) HDfprintf(stdout, "(r, %d, %d, %d) ", type, (idx - lag + 2), - (int)rename_to_main_addr); + (int)move_to_main_addr); - rename_entry(cache_ptr, type, (idx - lag + 2), - rename_to_main_addr); + move_entry(cache_ptr, type, (idx - lag + 2), + move_to_main_addr); } @@ -1449,7 +1449,7 @@ jrnl_row_major_scan_backward(H5F_t * file_ptr, /*------------------------------------------------------------------------- * Function: jrnl_row_major_scan_forward() * - * Purpose: Do a sequence of inserts, protects, unprotects, renames, + * Purpose: Do a sequence of inserts, protects, unprotects, moves, * and destroys broken into transactions while scanning * through the set of entries. * @@ -1480,8 +1480,8 @@ jrnl_row_major_scan_forward(H5F_t * file_ptr, hbool_t display_detailed_stats, hbool_t do_inserts, hbool_t dirty_inserts, - hbool_t do_renames, - hbool_t rename_to_main_addr, + hbool_t do_moves, + hbool_t move_to_main_addr, hbool_t do_destroys, hbool_t do_mult_ro_protects, int dirty_destroys, @@ -1597,7 +1597,7 @@ jrnl_row_major_scan_forward(H5F_t * file_ptr, } - if ( ( pass ) && ( do_renames ) && + if ( ( pass ) && ( do_moves ) && ( (idx + lag - 2) >= 0 ) && ( (idx + lag - 2) >= lower_bound ) && ( (idx + lag - 2) <= local_max_index ) && @@ -1607,11 +1607,11 @@ jrnl_row_major_scan_forward(H5F_t * file_ptr, if ( verbose ) HDfprintf(stdout, "4(r, %d, %d, %d) ", type, (idx + lag - 2), - (int)rename_to_main_addr); + (int)move_to_main_addr); - /*** rename entry idx + lag -2 ***/ - rename_entry(cache_ptr, type, (idx + lag - 2), - rename_to_main_addr); + /*** move entry idx + lag -2 ***/ + move_entry(cache_ptr, type, (idx + lag - 2), + move_to_main_addr); } @@ -3539,7 +3539,7 @@ mdj_smoke_check_00(hbool_t human_readable, HDfprintf(stdout, "%s:%d cp = %d.\n", fcn_name, pass, cp++); - /* d) Mix up some protect/unprotect calls with renames. Do this with + /* d) Mix up some protect/unprotect calls with moves. Do this with * different orders to make things interesting. */ @@ -3558,8 +3558,8 @@ mdj_smoke_check_00(hbool_t human_readable, protect_entry(file_ptr, MICRO_ENTRY_TYPE, 4); unprotect_entry(file_ptr, MICRO_ENTRY_TYPE, 4, TRUE, H5C__NO_FLAGS_SET); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 2, FALSE); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 3, FALSE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 2, FALSE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 3, FALSE); end_trans(file_ptr, cache_ptr, verbose, (uint64_t)1, "transaction 1.2"); @@ -3583,8 +3583,8 @@ mdj_smoke_check_00(hbool_t human_readable, begin_trans(cache_ptr, verbose, (uint64_t)2, "transaction 2.2"); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 3, TRUE); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 2, TRUE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 3, TRUE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 2, TRUE); protect_entry(file_ptr, MICRO_ENTRY_TYPE, 0); unprotect_entry(file_ptr, MICRO_ENTRY_TYPE, 0, FALSE, H5C__NO_FLAGS_SET); @@ -3671,7 +3671,7 @@ mdj_smoke_check_00(hbool_t human_readable, /* e-2) ... then use the H5C_mark_entry_dirty() * call to mark a variety of protected, pinned, and pinned and - * protected entries dirty. Also rename some pinned entries. + * protected entries dirty. Also move some pinned entries. */ begin_trans(cache_ptr, verbose, (uint64_t)4, "transaction 4.2"); @@ -3690,8 +3690,8 @@ mdj_smoke_check_00(hbool_t human_readable, mark_entry_dirty(file_ptr, MICRO_ENTRY_TYPE, 6); mark_entry_dirty(file_ptr, MICRO_ENTRY_TYPE, 7); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 4, FALSE); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 5, FALSE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 4, FALSE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 5, FALSE); unprotect_entry(file_ptr, MICRO_ENTRY_TYPE, 0, FALSE, H5C__NO_FLAGS_SET); unprotect_entry(file_ptr, MICRO_ENTRY_TYPE, 1, TRUE, H5C__NO_FLAGS_SET); @@ -3723,7 +3723,7 @@ mdj_smoke_check_00(hbool_t human_readable, /* e-3) ...finally, upin all the pinned entries, with an undo of the - * previous rename in the middle. + * previous move in the middle. */ begin_trans(cache_ptr, verbose, (uint64_t)5, "transaction 5.2"); @@ -3732,8 +3732,8 @@ mdj_smoke_check_00(hbool_t human_readable, unpin_entry(file_ptr, MICRO_ENTRY_TYPE, 3); unpin_entry(file_ptr, MICRO_ENTRY_TYPE, 4); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 4, TRUE); - rename_entry(cache_ptr, MICRO_ENTRY_TYPE, 5, TRUE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 4, TRUE); + move_entry(cache_ptr, MICRO_ENTRY_TYPE, 5, TRUE); unpin_entry(file_ptr, MICRO_ENTRY_TYPE, 5); unpin_entry(file_ptr, MICRO_ENTRY_TYPE, 6); @@ -3875,46 +3875,46 @@ mdj_smoke_check_00(hbool_t human_readable, - /* f-3) Now put all the sizes back, and also rename all the entries. */ + /* f-3) Now put all the sizes back, and also move all the entries. */ begin_trans(cache_ptr, verbose, (uint64_t)8, "transaction 8.2"); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 0, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 0, FALSE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 0, H5C__SIZE_CHANGED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 1, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 1, FALSE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 1, H5C__SIZE_CHANGED_FLAG|H5C__DIRTIED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 2, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 2, FALSE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 2, H5C__SIZE_CHANGED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 3, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 3, FALSE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 3, H5C__SIZE_CHANGED_FLAG|H5C__DIRTIED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 4, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 4, FALSE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 5, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 5, FALSE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 6, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 6, FALSE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 7, FALSE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 7, FALSE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, VARIABLE_ENTRY_SIZE); @@ -3941,49 +3941,49 @@ mdj_smoke_check_00(hbool_t human_readable, - /* f-4) Finally, rename all the entries back to their original locations, + /* f-4) Finally, move all the entries back to their original locations, * and unpin all the pinned entries. */ begin_trans(cache_ptr, verbose, (uint64_t)9, "transaction 9.2"); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 0, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 0, TRUE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 0); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 0, H5C__SIZE_CHANGED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 1, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 1, TRUE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 1); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 1, H5C__SIZE_CHANGED_FLAG|H5C__DIRTIED_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 2, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 2, TRUE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 2); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 2, H5C__SIZE_CHANGED_FLAG|H5C__UNPIN_ENTRY_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 3, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 3, TRUE); protect_entry(file_ptr, VARIABLE_ENTRY_TYPE, 3); unprotect_entry_with_size_change(file_ptr, VARIABLE_ENTRY_TYPE, 3, H5C__SIZE_CHANGED_FLAG|H5C__DIRTIED_FLAG|H5C__UNPIN_ENTRY_FLAG, VARIABLE_ENTRY_SIZE); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 4, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 4, TRUE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4, VARIABLE_ENTRY_SIZE); unpin_entry(file_ptr, VARIABLE_ENTRY_TYPE, 4); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 5, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 5, TRUE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5, VARIABLE_ENTRY_SIZE); unpin_entry(file_ptr, VARIABLE_ENTRY_TYPE, 5); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 6, TRUE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6, VARIABLE_ENTRY_SIZE); unpin_entry(file_ptr, VARIABLE_ENTRY_TYPE, 6); - rename_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 7, TRUE); + move_entry(cache_ptr, VARIABLE_ENTRY_TYPE, 7, TRUE); resize_pinned_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7, VARIABLE_ENTRY_SIZE); unpin_entry(file_ptr, VARIABLE_ENTRY_TYPE, 7); @@ -4063,7 +4063,7 @@ mdj_smoke_check_00(hbool_t human_readable, /* g-2) Now setup flush operations on some entries to dirty, resize, - * and/or rename other entries. When these entries are dirtied + * and/or move other entries. When these entries are dirtied * in a transaction, the associated flush operations should be * triggered and appear in the journal. * @@ -4072,14 +4072,14 @@ mdj_smoke_check_00(hbool_t human_readable, * * (MICRO_ENTRY_TYPE, 20) dirties (MICRO_ENTRY_TYPE, 30) * - * (MICRO_ENTRY_TYPE, 21) renames, resizes, and dirties: + * (MICRO_ENTRY_TYPE, 21) moves, resizes, and dirties: * (VARIABLE_ENTRY_TYPE, 10) * (VARIABLE_ENTRY_TYPE, 13) * * (MICRO_ENTRY_TYPE, 22) resizes (VARIABLE_ENTRY_TYPE, 11) * (VARIABLE_ENTRY_TYPE, 12) * - * (MICRO_ENTRY_TYPE, 23) renames (VARIABLE_ENTRY_TYPE, 10) + * (MICRO_ENTRY_TYPE, 23) moves (VARIABLE_ENTRY_TYPE, 10) * (VARIABLE_ENTRY_TYPE, 13) * to their original locations * @@ -4097,14 +4097,14 @@ mdj_smoke_check_00(hbool_t human_readable, add_flush_op(MICRO_ENTRY_TYPE, 21, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE); add_flush_op(MICRO_ENTRY_TYPE, 21, - FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0); + FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0); add_flush_op(MICRO_ENTRY_TYPE, 21, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0); add_flush_op(MICRO_ENTRY_TYPE, 21, FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 13, FALSE, VARIABLE_ENTRY_SIZE/4); add_flush_op(MICRO_ENTRY_TYPE, 21, - FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 13, FALSE, 0); + FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 13, FALSE, 0); add_flush_op(MICRO_ENTRY_TYPE, 21, FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 13, FALSE, 0); @@ -4117,10 +4117,10 @@ mdj_smoke_check_00(hbool_t human_readable, add_flush_op(MICRO_ENTRY_TYPE, 23, - FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, TRUE, 0); + FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, TRUE, 0); add_flush_op(MICRO_ENTRY_TYPE, 23, - FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 13, TRUE, 0); + FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 13, TRUE, 0); add_flush_op(MICRO_ENTRY_TYPE, 24, @@ -4165,7 +4165,7 @@ mdj_smoke_check_00(hbool_t human_readable, /* g-4) Now dirty (MICRO_ENTRY_TYPE, 24), which dirties * (MICRO_ENTRY_TYPE, 21), which dirties, resizes, and - * renames (VARIABLE_ENTRY_TYPE, 10) and (VARIABLE_ENTRY_TYPE, 13) + * moves (VARIABLE_ENTRY_TYPE, 10) and (VARIABLE_ENTRY_TYPE, 13) */ begin_trans(cache_ptr, verbose, (uint64_t)3, "transaction 3.3"); @@ -4195,7 +4195,7 @@ mdj_smoke_check_00(hbool_t human_readable, /* g-4) Now dirty (MICRO_ENTRY_TYPE, 25), which dirties * (MICRO_ENTRY_TYPE, 22) and (MICRO_ENTRY_TYPE, 23), which * in turn resize (VARIABLE_ENTRY_TYPE, 11) and - * (VARIABLE_ENTRY_TYPE, 12), and rename (VARIABLE_ENTRY_TYPE, 10) + * (VARIABLE_ENTRY_TYPE, 12), and move (VARIABLE_ENTRY_TYPE, 10) * and (VARIABLE_ENTRY_TYPE, 13) back to their original locations. */ @@ -4786,8 +4786,8 @@ mdj_smoke_check_01(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -4831,8 +4831,8 @@ mdj_smoke_check_01(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -4876,8 +4876,8 @@ mdj_smoke_check_01(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -5191,8 +5191,8 @@ mdj_smoke_check_02(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ TRUE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -5236,8 +5236,8 @@ mdj_smoke_check_02(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ FALSE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ TRUE, + /* do_moves */ TRUE, + /* move_to_main_addr */ TRUE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, @@ -5281,8 +5281,8 @@ mdj_smoke_check_02(hbool_t human_readable, /* display_detailed_stats */ FALSE, /* do_inserts */ TRUE, /* dirty_inserts */ dirty_inserts, - /* do_renames */ TRUE, - /* rename_to_main_addr */ FALSE, + /* do_moves */ TRUE, + /* move_to_main_addr */ FALSE, /* do_destroys */ FALSE, /* do_mult_ro_protects */ TRUE, /* dirty_destroys */ dirty_destroys, diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 35e4baa..aee92af 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -205,7 +205,7 @@ int virt_num_data_entries = NUM_DATA_ENTRIES; * The data_index array is an array of integer used to maintain a list * of instances of datum in the data array in increasing base_addr order. * - * This array is necessary, as rename operations can swap the values + * This array is necessary, as move operations can swap the values * of the base_addr fields of two instances of datum. Without this * array, we would no longer be able to use a binary search on a sorted * list to find the indexes of instances of datum given the values of @@ -380,7 +380,7 @@ void pin_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx, hbool_t global, hbool_t dirty); void pin_protected_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx, hbool_t global); -void rename_entry(H5C_t * cache_ptr, H5F_t * file_ptr, +void move_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t old_idx, int32_t new_idx); void resize_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx, size_t new_size); @@ -729,7 +729,7 @@ init_data(void) int j = 0; haddr_t addr = BASE_ADDR; - /* this must hold so renames don't change entry size. */ + /* this must hold so moves don't change entry size. */ HDassert( (NUM_DATA_ENTRIES / 2) % 20 == 0 ); HDassert( (virt_num_data_entries / 2) % 20 == 0 ); @@ -2932,9 +2932,9 @@ pin_protected_entry(H5C_t * cache_ptr, /***************************************************************************** - * Function: rename_entry() + * Function: move_entry() * - * Purpose: Rename the entry indicated old_idx to the entry indicated + * Purpose: Move the entry indicated old_idx to the entry indicated * by new_idex. Touch up the data array so that flush will * not choke. * @@ -2954,12 +2954,12 @@ pin_protected_entry(H5C_t * cache_ptr, *****************************************************************************/ void -rename_entry(H5C_t * cache_ptr, +move_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t old_idx, int32_t new_idx) { - const char * fcn_name = "rename_entry()"; + const char * fcn_name = "move_entry()"; herr_t result; int tmp; size_t tmp_len; @@ -2988,13 +2988,13 @@ rename_entry(H5C_t * cache_ptr, old_addr = old_entry_ptr->base_addr; new_addr = new_entry_ptr->base_addr; - result = H5AC_rename(file_ptr, &(types[0]), old_addr, new_addr); + result = H5AC_move_entry(file_ptr, &(types[0]), old_addr, new_addr); if ( ( result < 0 ) || ( old_entry_ptr->header.addr != new_addr ) ) { nerrors++; if ( verbose ) { - HDfprintf(stdout, "%d:%s: H5AC_rename() failed.\n", + HDfprintf(stdout, "%d:%s: H5AC_move_entry() failed.\n", world_mpi_rank, fcn_name); } @@ -3037,7 +3037,7 @@ rename_entry(H5C_t * cache_ptr, return; -} /* rename_entry() */ +} /* move_entry() */ /***************************************************************************** @@ -3095,7 +3095,7 @@ resize_entry(H5C_t * cache_ptr, nerrors++; if ( verbose ) { - HDfprintf(stdout, "%d:%s: H5AC_rename() failed.\n", + HDfprintf(stdout, "%d:%s: H5AC_resize_pinned_entry() failed.\n", world_mpi_rank, fcn_name); } @@ -4083,12 +4083,12 @@ smoke_check_1(void) fflush(stdout); } - /* rename the first half of the entries... */ + /* Move the first half of the entries... */ for ( i = 0; i < (virt_num_data_entries / 2); i++ ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); } @@ -4098,12 +4098,12 @@ smoke_check_1(void) fflush(stdout); } - /* ...and then rename them back. */ + /* ...and then move them back. */ for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); } @@ -4221,7 +4221,7 @@ smoke_check_1(void) * Added pinned entry tests. * * JRM -- 4/28/06 - * Modified test to rename pinned entries. + * Modified test to move pinned entries. * *****************************************************************************/ @@ -4313,27 +4313,27 @@ smoke_check_2(void) 0, 100); } - /* we can't rename pinned entries, so release any local pins now. */ + /* we can't move pinned entries, so release any local pins now. */ local_unpin_all_entries(cache_ptr, file_ptr, FALSE); - /* rename the first half of the entries... */ + /* Move the first half of the entries... */ for ( i = 0; i < (virt_num_data_entries / 2); i++ ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, ((virt_num_data_entries / 50) - 1), 0, 100); } - /* ...and then rename them back. */ + /* ...and then move them back. */ for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, (virt_num_data_entries / 100), @@ -4612,30 +4612,30 @@ smoke_check_3(void) min_idx, max_idx, 0, 100); } - /* we can't rename pinned entries, so release any local pins now. */ + /* we can't move pinned entries, so release any local pins now. */ local_unpin_all_entries(cache_ptr, file_ptr, FALSE); min_count = 10 / (file_mpi_rank + 1); max_count = min_count + 100; - /* rename the first half of the entries... */ + /* move the first half of the entries... */ for ( i = 0; i < (virt_num_data_entries / 2); i++ ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, (virt_num_data_entries / 20), min_count, max_count); } - /* ...and then rename them back. */ + /* ...and then move them back. */ for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, (virt_num_data_entries / 40), @@ -4935,30 +4935,30 @@ smoke_check_4(void) min_idx, max_idx, 0, 100); } - /* we can't rename pinned entries, so release any local pins now. */ + /* we can't move pinned entries, so release any local pins now. */ local_unpin_all_entries(cache_ptr, file_ptr, FALSE); min_count = 10 * (file_mpi_rank % 4); max_count = min_count + 100; - /* rename the first half of the entries... */ + /* move the first half of the entries... */ for ( i = 0; i < (virt_num_data_entries / 2); i++ ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, (virt_num_data_entries / 20), min_count, max_count); } - /* ...and then rename them back. */ + /* ...and then move them back. */ for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- ) { lock_entry(cache_ptr, file_ptr, i); unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG); - rename_entry(cache_ptr, file_ptr, i, + move_entry(cache_ptr, file_ptr, i, (i + (virt_num_data_entries / 2))); lock_and_unlock_random_entries(cache_ptr, file_ptr, 0, (virt_num_data_entries / 40), @@ -5380,7 +5380,7 @@ smoke_check_5(void) * - H5AC_flush() * - H5AC_set() * - H5AC_mark_entry_dirty() - * H5AC_rename() + * H5AC_move_entry() * - H5AC_pin_protected_entry() * - H5AC_protect() * - H5AC_unpin_entry() @@ -5440,8 +5440,8 @@ trace_file_check(void) "H5AC_resize_pinned_entry 0x404 2 0\n", "H5AC_resize_pinned_entry 0x404 4 0\n", "H5AC_unpin_entry 0x404 0\n", - "H5AC_rename 0x400 0x8e65 16 0\n", - "H5AC_rename 0x8e65 0x400 16 0\n", + "H5AC_move_entry 0x400 0x8e65 16 0\n", + "H5AC_move_entry 0x8e65 0x400 16 0\n", "H5AC_flush 0x0 0\n", NULL }; @@ -5550,8 +5550,8 @@ trace_file_check(void) resize_entry(cache_ptr, file_ptr, 2, data[2].len); unpin_entry(cache_ptr, file_ptr, 2, TRUE, FALSE, FALSE); - rename_entry(cache_ptr, file_ptr, 0, 20); - rename_entry(cache_ptr, file_ptr, 0, 20); + move_entry(cache_ptr, file_ptr, 0, 20); + move_entry(cache_ptr, file_ptr, 0, 20); if ( H5Fflush(fid, H5F_SCOPE_GLOBAL) < 0 ) { nerrors++; |