summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--src/H5AC.c99
-rw-r--r--src/H5ACpkg.h18
-rw-r--r--src/H5ACprivate.h4
-rw-r--r--src/H5B.c2
-rw-r--r--src/H5C.c118
-rw-r--r--src/H5Cpkg.h56
-rw-r--r--src/H5Cprivate.h4
-rw-r--r--src/H5Edefin.h4
-rw-r--r--src/H5Einit.h12
-rw-r--r--src/H5Epubgen.h6
-rw-r--r--src/H5Eterm.h4
-rw-r--r--src/H5HFcache.c20
-rw-r--r--src/H5HFiblock.c6
-rw-r--r--src/H5HL.c4
-rw-r--r--src/H5err.txt4
-rw-r--r--test/cache.c330
-rw-r--r--test/cache_common.c44
-rw-r--r--test/cache_common.h24
-rw-r--r--testpar/t_cache.c72
20 files changed, 390 insertions, 443 deletions
diff --git a/configure b/configure
index 124744d..681af2f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 18684 2010-05-02 15:21:31Z hdftest .
+# From configure.in Id: configure.in 18709 2010-05-05 17:34:26Z mamcgree .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for HDF5 1.9.69.
#
diff --git a/src/H5AC.c b/src/H5AC.c
index cff818c..1b98258 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -91,7 +91,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.
*
****************************************************************************/
@@ -189,7 +189,7 @@ static herr_t H5AC_receive_and_apply_clean_list(H5F_t * f,
hid_t secondary_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);
@@ -580,8 +580,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;
@@ -1310,7 +1310,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5AC_rename
+ * Function: H5AC_move_entry
*
* Purpose: Use this function to notify the cache that an object's
* file address changed.
@@ -1321,37 +1321,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.
- *
*-------------------------------------------------------------------------
*/
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 */
@@ -1363,7 +1336,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);
@@ -1373,7 +1346,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.
*/
@@ -1383,7 +1356,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));
@@ -1392,20 +1365,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
@@ -1437,7 +1410,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC_rename() */
+} /* H5AC_move_entry() */
/*-------------------------------------------------------------------------
@@ -3900,15 +3873,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
@@ -3916,17 +3889,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.
@@ -3948,7 +3921,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)
{
@@ -3960,7 +3933,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 );
@@ -4065,8 +4038,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 */
}
@@ -4092,8 +4065,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 */
}
@@ -4101,7 +4074,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC_log_renamed_entry() */
+} /* H5AC_log_moved_entry() */
#endif /* H5_HAVE_PARALLEL */
@@ -4209,8 +4182,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 ) {
@@ -4271,8 +4244,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:
@@ -4466,8 +4439,8 @@ H5AC_flush_entries(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 */
/* to prevent "messages from the future" we must synchronize all
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 818a616..47c6306 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -129,7 +129,7 @@ typedef enum {
#define H5AC_CALLBACK__NO_FLAGS_SET H5C_CALLBACK__NO_FLAGS_SET
#define H5AC_CALLBACK__SIZE_CHANGED_FLAG H5C_CALLBACK__SIZE_CHANGED_FLAG
-#define H5AC_CALLBACK__RENAMED_FLAG H5C_CALLBACK__RENAMED_FLAG
+#define H5AC_CALLBACK__MOVED_FLAG H5C_CALLBACK__MOVED_FLAG
/* Aliases for 'notify action' type & values */
typedef H5C_notify_action_t H5AC_notify_action_t;
@@ -338,7 +338,7 @@ H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id,
void *thing, unsigned flags);
H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id);
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);
diff --git a/src/H5B.c b/src/H5B.c
index 50eea4c..48a8c67 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -668,7 +668,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) */
diff --git a/src/H5C.c b/src/H5C.c
index 33402a8..20fb0e7 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1078,7 +1078,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.
*
@@ -1209,7 +1209,7 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
*
* To make things more entertaining, with the advent of the
* fractal heap, the entry flush 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:
@@ -2857,7 +2857,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.
@@ -2867,32 +2867,6 @@ 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 -- 11/5/08
* On review this function looks like no change is needed to
* support the new clean_index_size and dirty_index_size
@@ -2901,7 +2875,7 @@ done:
*-------------------------------------------------------------------------
*/
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)
@@ -2914,7 +2888,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 );
@@ -2944,7 +2918,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.")
}
@@ -2954,12 +2928,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?.")
}
@@ -2970,7 +2944,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.
@@ -3034,11 +3008,11 @@ H5C_rename_entry(H5C_t * cache_ptr,
#endif /* H5C_DO_SANITY_CHECKS */
- H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, FAIL)
+ H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, FAIL)
}
}
- H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)
+ H5C__UPDATE_STATS_FOR_MOVE(cache_ptr, entry_ptr)
done:
@@ -3052,7 +3026,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_rename_entry() */
+} /* H5C_move_entry() */
/*-------------------------------------------------------------------------
@@ -4336,9 +4310,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;
@@ -4389,11 +4363,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
@@ -4549,17 +4523,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,
@@ -4678,17 +4652,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",
@@ -4829,9 +4803,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;
@@ -7420,7 +7394,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
@@ -7501,14 +7475,14 @@ H5C_flush_invalidate_cache(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.
@@ -7577,7 +7551,7 @@ H5C_flush_invalidate_cache(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.
@@ -8029,7 +8003,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.
@@ -8226,8 +8200,8 @@ H5C_flush_single_entry(H5F_t * f,
* We must do deletions now as the callback routines will free the
* entry if destroy is true.
*
- * Note that it is possible that the entry will be renamed during
- * its call to flush. This will upset H5C_rename_entry() if we
+ * 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.
@@ -8470,9 +8444,9 @@ H5C_flush_single_entry(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
@@ -8485,7 +8459,7 @@ H5C_flush_single_entry(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.")
}
}
@@ -8570,9 +8544,9 @@ H5C_flush_single_entry(H5F_t * f,
}
}
- if ( (flush_flags & H5C_CALLBACK__RENAMED_FLAG) != 0 ) {
+ if ( (flush_flags & H5C_CALLBACK__MOVED_FLAG) != 0 ) {
- /* The entry was renamed as the result of the flush.
+ /* The entry was moved as the result of the flush.
*
* Most likely, the entry was compressed, and the
* new version is larger than the old and thus had
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 538bc61..9e99d29 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -44,7 +44,7 @@
#include "H5SLprivate.h" /* Skip lists */
/* 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.
@@ -283,7 +283,7 @@
* 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.
@@ -669,19 +669,19 @@
* 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
@@ -959,9 +959,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];
@@ -1492,14 +1492,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 ) { \
@@ -1727,7 +1727,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)
@@ -2172,7 +2172,7 @@ if ( (cache_ptr)->index_size != \
* 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.
*
*-------------------------------------------------------------------------
@@ -2311,7 +2311,7 @@ if ( (cache_ptr)->index_size != \
* 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.
*
*-------------------------------------------------------------------------
@@ -3056,10 +3056,10 @@ if ( (cache_ptr)->index_size != \
/*-------------------------------------------------------------------------
*
- * 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
@@ -3073,8 +3073,8 @@ if ( (cache_ptr)->index_size != \
* 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
+ * Converted the function H5C_update_rp_for_move() to the
+ * macro H5C__UPDATE_RP_FOR_MOVE 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
@@ -3088,11 +3088,11 @@ if ( (cache_ptr)->index_size != \
*
* JRM - 6/23/05
* Added the was_dirty parameter. It is possible that
- * the entry was clean when it was renamed -- if so it
+ * the entry was clean when it was moved -- 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
+ * At present, all moved 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.
@@ -3112,7 +3112,7 @@ if ( (cache_ptr)->index_size != \
#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
-#define H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, fail_val) \
+#define H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, fail_val) \
{ \
HDassert( (cache_ptr) ); \
HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \
@@ -3186,11 +3186,11 @@ if ( (cache_ptr)->index_size != \
\
/* 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, fail_val) \
+#define H5C__UPDATE_RP_FOR_MOVE(cache_ptr, entry_ptr, was_dirty, fail_val) \
{ \
HDassert( (cache_ptr) ); \
HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC ); \
@@ -3219,7 +3219,7 @@ if ( (cache_ptr)->index_size != \
\
/* 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 f6792ba..f836854 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -122,7 +122,7 @@ typedef struct H5C_t H5C_t;
#define H5C_CALLBACK__NO_FLAGS_SET 0x0
#define H5C_CALLBACK__SIZE_CHANGED_FLAG 0x1
-#define H5C_CALLBACK__RENAMED_FLAG 0x2
+#define H5C_CALLBACK__MOVED_FLAG 0x2
/* Actions that can be reported to 'notify' client callback */
typedef enum H5C_notify_action_t {
@@ -1118,7 +1118,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 16e922a..b871396 100644
--- a/src/H5Edefin.h
+++ b/src/H5Edefin.h
@@ -108,6 +108,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 */
@@ -156,7 +157,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 */
@@ -173,7 +173,7 @@ hid_t H5E_CANTNOTIFY_g = FAIL; /* Unable to notify object about action
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 cea2888..d1ff816 100644
--- a/src/H5Einit.h
+++ b/src/H5Einit.h
@@ -398,6 +398,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, FALSE))<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, FALSE))<0)
+ HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
/* System level errors */
assert(H5E_SYSERRSTR_g==(-1));
@@ -582,11 +587,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, FALSE))<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, FALSE))<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")
@@ -660,7 +660,7 @@ if((msg = H5E_create_msg(cls, H5E_MINOR, "Link class not registered"))==NULL)
if((H5E_NOTREGISTERED_g = H5I_register(H5I_ERROR_MSG, msg, FALSE))<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, FALSE))<0)
HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
index 999ea61..c1c222a 100644
--- a/src/H5Epubgen.h
+++ b/src/H5Epubgen.h
@@ -176,6 +176,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 */
@@ -184,6 +185,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)
@@ -259,7 +261,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 */
@@ -300,7 +300,7 @@ H5_DLLVAR hid_t H5E_CANTNOTIFY_g; /* Unable to notify object about action */
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 0997990..be40694 100644
--- a/src/H5Eterm.h
+++ b/src/H5Eterm.h
@@ -109,7 +109,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=
@@ -158,7 +159,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/H5HFcache.c b/src/H5HFcache.c
index 58c48ac..2faedb3 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -1020,8 +1020,8 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
HDassert(!H5F_addr_eq(iblock->addr, addr));
/* Let the metadata cache know the block moved */
- if(H5AC_rename(f, H5AC_FHEAP_IBLOCK, iblock->addr, addr) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move indirect block")
+ if(H5AC_move_entry(f, H5AC_FHEAP_IBLOCK, iblock->addr, addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move indirect block")
/* Update the internal address for the block */
iblock->addr = addr;
@@ -1494,8 +1494,8 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
/* Let the metadata cache know, if the block moved */
if(!H5F_addr_eq(hdr->man_dtable.table_addr, addr))
- if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
+ if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
/* Update information about compressed direct block's location & size */
hdr->man_dtable.table_addr = addr;
@@ -1545,8 +1545,8 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
/* Let the metadata cache know, if the block moved */
if(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr))
- if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
+ if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
/* Update information about compressed direct block's location & size */
par_iblock->ents[par_entry].addr = addr;
@@ -1581,8 +1581,8 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
HDassert(!H5F_addr_eq(hdr->man_dtable.table_addr, addr));
/* Let the metadata cache know the block moved */
- if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
+ if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
/* Update information about direct block's location */
hdr->man_dtable.table_addr = addr;
@@ -1610,8 +1610,8 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
HDassert(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr));
/* Let the metadata cache know the block moved */
- if(H5AC_rename(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
- HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move direct block")
+ if(H5AC_move_entry(f, H5AC_FHEAP_DBLOCK, par_iblock->ents[par_entry].addr, addr) < 0)
+ HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move direct block")
/* Update information about direct block's location */
par_iblock->ents[par_entry].addr = addr;
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index bb01ba1..b7fb666 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -572,8 +572,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 */
@@ -741,7 +741,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 */
diff --git a/src/H5HL.c b/src/H5HL.c
index 09df1cb..24a54f3 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -280,8 +280,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 67b6448..891638a 100644
--- a/src/H5err.txt
+++ b/src/H5err.txt
@@ -161,7 +161,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
@@ -196,6 +195,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
@@ -224,7 +224,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 8eb7d37..09cecf2 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -97,16 +97,16 @@ static unsigned check_flush_protected_err(void);
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);
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);
@@ -139,7 +139,7 @@ static unsigned check_notify_cb(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.
*
@@ -205,8 +205,8 @@ smoke_check_1(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,
@@ -224,8 +224,8 @@ smoke_check_1(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,
@@ -243,8 +243,8 @@ smoke_check_1(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,
@@ -330,7 +330,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.
*
@@ -396,8 +396,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,
@@ -415,8 +415,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,
@@ -434,8 +434,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,
@@ -521,7 +521,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
@@ -586,8 +586,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,
@@ -605,8 +605,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,
@@ -624,8 +624,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,
@@ -711,7 +711,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.
*
@@ -777,8 +777,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,
@@ -796,8 +796,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,
@@ -815,8 +815,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,
@@ -1865,7 +1865,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.
*
@@ -1950,8 +1950,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,
@@ -1986,8 +1986,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,
@@ -2020,8 +2020,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,
@@ -2171,7 +2171,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.
*
@@ -2239,8 +2239,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,
@@ -2273,8 +2273,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,
@@ -2307,8 +2307,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,
@@ -2530,8 +2530,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,
@@ -2551,8 +2551,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,
@@ -2572,8 +2572,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,
@@ -5420,7 +5420,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.
*
@@ -5824,7 +5824,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 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
@@ -5852,7 +5852,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -5900,11 +5900,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
@@ -5936,7 +5936,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
@@ -5964,7 +5964,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* num_flush_ops = */ 1,
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
- { { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6012,11 +6012,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
@@ -6050,7 +6050,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
@@ -6079,7 +6079,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6126,11 +6126,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
@@ -6162,7 +6162,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
@@ -6191,7 +6191,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* flush_ops = */
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6238,11 +6238,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
@@ -6665,7 +6665,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.
@@ -6696,10 +6696,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6757,12 +6757,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 ) {
@@ -6794,7 +6794,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.
@@ -6825,10 +6825,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6886,12 +6886,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 ) {
@@ -6929,7 +6929,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.
*
@@ -6966,10 +6966,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -6994,10 +6994,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7148,7 +7148,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
@@ -7181,10 +7181,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7209,10 +7209,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7421,7 +7421,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
@@ -7451,10 +7451,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 0, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7479,10 +7479,10 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 10, FALSE, VARIABLE_ENTRY_SIZE / 4, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 10, FALSE, 0, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 12, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 12, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -7990,12 +7990,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)
@@ -8007,7 +8007,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)
*
@@ -8140,7 +8140,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8167,7 +8167,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8427,12 +8427,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)
@@ -8444,7 +8444,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)
*
@@ -8577,7 +8577,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
{ FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8604,7 +8604,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 2100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 2200, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 2300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8882,7 +8882,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8910,7 +8910,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -8966,7 +8966,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -9075,7 +9075,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 200, FALSE, VARIABLE_ENTRY_SIZE, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 200, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -9103,7 +9103,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 400, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 300, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 300, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -9159,7 +9159,7 @@ check_flush_cache__flush_ops(H5F_t * file_ptr)
/* op_code: type: idx: flag: size: order_ptr: */
{ { FLUSH_OP__DIRTY, VARIABLE_ENTRY_TYPE, 100, FALSE, 0, NULL },
{ FLUSH_OP__RESIZE, VARIABLE_ENTRY_TYPE, 500, FALSE, VARIABLE_ENTRY_SIZE / 2, NULL },
- { FLUSH_OP__RENAME, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
+ { FLUSH_OP__MOVE, VARIABLE_ENTRY_TYPE, 500, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
{ FLUSH_OP__NO_OP, 0, 0, FALSE, 0, NULL },
@@ -9991,7 +9991,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
*
* (VET, 2) 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, 3) dirties (VET, 0)
* resizes itself to VARIABLE_ENTRY_SIZE
@@ -10008,7 +10008,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL);
add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RESIZE,
VARIABLE_ENTRY_TYPE, 0, FALSE, VARIABLE_ENTRY_SIZE, NULL);
- add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__RENAME,
+ add_flush_op(VARIABLE_ENTRY_TYPE, 2, FLUSH_OP__MOVE,
VARIABLE_ENTRY_TYPE, 0, FALSE, (size_t)0, NULL);
add_flush_op(VARIABLE_ENTRY_TYPE, 3, FLUSH_OP__DIRTY,
@@ -10035,7 +10035,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
*
* (VET, 2) Y 10 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, 3) Y 5 KB Y N 0, 7 dirty (VET, 0)
* resize (VET, 3) to 10 KB
@@ -10109,7 +10109,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
*
* (VET, 2) Y 10 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, 3) Y 5 KB Y N 0, 7 dirty (VET, 0)
* resize (VET, 3) to 10 KB
@@ -10161,7 +10161,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
/* Now load another large entry. This should result in the eviction
* of (VET, 2), the increase in the size of (VET, 0) from .75
- * VARIABLE_ENTRY_SIZE to 1.0 VARIABLE_ENTRY_SIZE, and the renaming
+ * VARIABLE_ENTRY_SIZE to 1.0 VARIABLE_ENTRY_SIZE, and the moving
* of (VET, 0) to its alternate address.
*
* The following table shows the expected states of the variable
@@ -10844,9 +10844,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] != 14 ) ||
( cache_ptr->evictions[VARIABLE_ENTRY_TYPE] != 9 ) ||
- ( 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 ) ||
@@ -10869,9 +10869,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 ) ||
@@ -10894,9 +10894,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 ) ||
@@ -14470,9 +14470,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.
*
@@ -14487,12 +14487,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,
@@ -14520,23 +14520,23 @@ check_rename_entry(void)
}
};
- TESTING("H5C_rename_entry() functionality");
+ TESTING("H5C_move_entry() functionality");
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.
*
* At present, we should do the following tests:
*
- * 1) Rename a clean, unprotected, unpinned entry.
+ * 1) move a clean, unprotected, unpinned entry.
*
- * 2) Rename a dirty, unprotected, unpinned entry.
+ * 2) move a dirty, unprotected, unpinned entry.
*
- * 3) Rename a clean, unprotected, pinned entry.
+ * 3) move a clean, unprotected, pinned entry.
*
- * 4) Rename a dirty, unprotected, pinned entry.
+ * 4) move a dirty, unprotected, pinned entry.
*
* In all cases, the entry should have moved to its
* new location, and have been marked dirty if it wasn't
@@ -14560,7 +14560,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++;
}
@@ -14579,13 +14579,13 @@ check_rename_entry(void)
return (unsigned)!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.
*
@@ -14602,11 +14602,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;
@@ -14630,7 +14630,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;
@@ -14647,15 +14647,15 @@ 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 ) {
@@ -14664,7 +14664,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;
}
@@ -14683,7 +14683,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;
}
@@ -14697,7 +14697,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;
}
@@ -14707,7 +14707,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;
}
@@ -14715,11 +14715,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() */
/*-------------------------------------------------------------------------
@@ -16871,9 +16871,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
@@ -16887,9 +16887,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;
@@ -16897,11 +16897,11 @@ 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");
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.
*/
@@ -16925,25 +16925,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";
}
}
@@ -16962,7 +16962,7 @@ check_rename_err(void)
return (unsigned)!pass;
-} /* check_rename_err() */
+} /* check_move_err() */
/*-------------------------------------------------------------------------
@@ -34164,7 +34164,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();
@@ -34172,7 +34172,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 6290f2a..54b0ecf 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -1600,8 +1600,8 @@ execute_flush_op(H5F_t * file_ptr,
}
break;
- case FLUSH_OP__RENAME:
- rename_entry(cache_ptr, op_ptr->type, op_ptr->idx,
+ case FLUSH_OP__MOVE:
+ move_entry(cache_ptr, op_ptr->type, op_ptr->idx,
op_ptr->flag);
break;
@@ -3138,9 +3138,9 @@ mark_entry_dirty(int32_t type,
/*-------------------------------------------------------------------------
- * 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.
*
@@ -3153,7 +3153,7 @@ mark_entry_dirty(int32_t type,
*/
void
-rename_entry(H5C_t * cache_ptr,
+move_entry(H5C_t * cache_ptr,
int32_t type,
int32_t idx,
hbool_t main_addr)
@@ -3182,7 +3182,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 );
@@ -3192,7 +3192,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 );
@@ -3205,7 +3205,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);
}
@@ -3216,7 +3216,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 {
@@ -3232,7 +3232,7 @@ rename_entry(H5C_t * cache_ptr,
return;
-} /* rename_entry() */
+} /* move_entry() */
/*-------------------------------------------------------------------------
@@ -3833,7 +3833,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.
*
@@ -3854,8 +3854,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,
@@ -3929,12 +3929,12 @@ 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) <= max_indices[type] ) &&
( ( (idx + lag - 2) % 3 ) == 0 ) ) {
- rename_entry(cache_ptr, type, (idx + lag - 2),
- rename_to_main_addr);
+ move_entry(cache_ptr, type, (idx + lag - 2),
+ move_to_main_addr);
}
@@ -4253,7 +4253,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.
*
@@ -4274,8 +4274,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,
@@ -4343,12 +4343,12 @@ 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) % 3 ) == 0 ) ) {
- 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 3bb26ef..ec17774 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -141,7 +141,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__ORDER 4
#define FLUSH_OP__MAX_OP 4
@@ -159,7 +159,7 @@ typedef struct flush_op
* FLUSH_OP__NO_OP
* FLUSH_OP__DIRTY
* FLUSH_OP__RESIZE
- * FLUSH_OP__RENAME
+ * FLUSH_OP__MOVE
* FLUSH_OP__ORDER
*/
int type; /* type code of the cache entry that
@@ -192,12 +192,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.
*/
unsigned * order_ptr; /* Pointer to outside counter for
@@ -229,7 +229,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
@@ -480,7 +480,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;
@@ -670,7 +670,7 @@ void insert_entry(H5F_t * file_ptr,
void mark_entry_dirty(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);
@@ -719,8 +719,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,
@@ -743,8 +743,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/testpar/t_cache.c b/testpar/t_cache.c
index 9e6c8fc..5a6235d 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
@@ -365,7 +365,7 @@ void mark_entry_dirty(H5C_t * cache_ptr, H5F_t * file_ptr,
void pin_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx,
hbool_t global, hbool_t dirty);
void pin_protected_entry(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(int32_t idx, size_t new_size);
hbool_t setup_cache_for_test(hid_t * fid_ptr, H5F_t ** file_ptr_ptr,
@@ -725,7 +725,7 @@ init_data(void)
int j = 0;
haddr_t addr = 512;
- /* 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 );
@@ -2970,9 +2970,9 @@ pin_protected_entry(int32_t idx,
/*****************************************************************************
- * 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.
*
@@ -2992,12 +2992,12 @@ pin_protected_entry(int32_t idx,
*****************************************************************************/
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;
@@ -3026,13 +3026,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);
}
@@ -3075,7 +3075,7 @@ rename_entry(H5C_t * cache_ptr,
return;
-} /* rename_entry() */
+} /* move_entry() */
/*****************************************************************************
@@ -3129,7 +3129,7 @@ resize_entry(int32_t idx,
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);
}
@@ -4028,21 +4028,21 @@ smoke_check_1(void)
unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
}
- /* 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)));
}
- /* ...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)));
}
@@ -4136,7 +4136,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.
*
*****************************************************************************/
@@ -4228,27 +4228,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),
@@ -4559,18 +4559,18 @@ smoke_check_3(void)
/* 7 */
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
- /* 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),
@@ -4580,12 +4580,12 @@ smoke_check_3(void)
/* 8 */
if ( verbose ) {HDfprintf(stderr, "%d: cp = %d\n", world_mpi_rank, cp++);}
- /* ...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),
@@ -4897,30 +4897,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),
@@ -5298,7 +5298,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()
@@ -5354,8 +5354,8 @@ trace_file_check(void)
"H5AC_resize_pinned_entry 0x4 2 0\n",
"H5AC_resize_pinned_entry 0x4 4 0\n",
"H5AC_unpin_entry 4 0\n",
- "H5AC_rename 0 8a65 15 0\n",
- "H5AC_rename 8a65 0 15 0\n",
+ "H5AC_move_entry 0 8a65 15 0\n",
+ "H5AC_move_entry 8a65 0 15 0\n",
"H5AC_flush 0\n",
NULL
};
@@ -5464,8 +5464,8 @@ trace_file_check(void)
resize_entry(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++;