summaryrefslogtreecommitdiffstats
path: root/test/cache_common.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-06 15:39:23 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-06 15:39:23 (GMT)
commitabd749619d15cf7a3e927232ac2ad7ed1c726dd2 (patch)
treec722e8827c02f11e97b1106e2cb016c65b1b6eb5 /test/cache_common.h
parentb95c7d1879120c542490c031c70b88f6e5fa7eaa (diff)
downloadhdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.zip
hdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.tar.gz
hdf5-abd749619d15cf7a3e927232ac2ad7ed1c726dd2.tar.bz2
[svn-r18726] Description:
Bring r18725 from trunk to 1.8 branch: Bring r18724 from metadata journaling 'merging' branch to trunk: Rename H5[A]C_rename to H5[A]C_move_entry. Tested on: FreeBSD/32 6.3 (duty) w/debug (h5committested on trunk)
Diffstat (limited to 'test/cache_common.h')
-rw-r--r--test/cache_common.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/cache_common.h b/test/cache_common.h
index ca651bf..c04d685 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -131,7 +131,7 @@
#define FLUSH_OP__NO_OP 0
#define FLUSH_OP__DIRTY 1
#define FLUSH_OP__RESIZE 2
-#define FLUSH_OP__RENAME 3
+#define FLUSH_OP__MOVE 3
#define FLUSH_OP__MAX_OP 3
#define MAX_FLUSH_OPS 10 /* Maximum number of flush operations
@@ -148,7 +148,7 @@ typedef struct flush_op
* FLUSH_OP__NO_OP
* FLUSH_OP__DIRTY
* FLUSH_OP__RESIZE
- * FLUSH_OP__RENAME
+ * FLUSH_OP__MOVE
*/
int type; /* type code of the cache entry that
* is the target of the operation.
@@ -180,12 +180,12 @@ typedef struct flush_op
* H5C_mark_entry_dirty()
* call.
*
- * FLUSH_OP__RENAME: TRUE iff the
- * target is to be renamed to
+ * FLUSH_OP__MOVE: TRUE iff the
+ * target is to be moved to
* its main address.
*/
size_t size; /* New target size in the
- * FLUSH_OP__RENAME operation.
+ * FLUSH_OP__MOVE operation.
* Unused elsewhere.
*/
} flush_op;
@@ -213,7 +213,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
@@ -451,7 +451,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;
@@ -624,7 +624,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);
@@ -670,8 +670,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,
@@ -694,8 +694,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,