[svn-r8854] Purpose:

    Code optimization

Description:
    Refactor B-tree code to extract all common information for a B-tree into a
shared structure that is pointed to by all the nodes in tree (instead of being
included in each node).

    Also re-order B-tree node comparison checks for chunked datasets to
check for >= the upper node first, since the comparison is a bit "heavy" and
this check is more likely to succeed when you are adding records to the
dataset.

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest
    (also, recent h5dump commits have broken testing...)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index b160419..83b8b57 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -212,7 +212,7 @@ typedef struct H5F_t H5F_t;
 /* Check for file driver feature enabled */
 #define H5F_HAS_FEATURE(F,FL)   ((F)->shared->lf->feature_flags&(FL))
 /* B-tree node raw page */
-#define H5F_RC_PAGE(F)          ((F)->shared->rc_page)
+#define H5F_GRP_BTREE_SHARED(F) ((F)->shared->grp_btree_shared)
 #else /* H5F_PACKAGE */
 #define H5F_SIZEOF_ADDR(F)      (H5F_sizeof_addr(F))
 #define H5F_SIZEOF_SIZE(F)      (H5F_sizeof_size(F))
@@ -222,7 +222,7 @@ typedef struct H5F_t H5F_t;
 #define H5F_RDCC_NBYTES(F)      (H5F_rdcc_nbytes(F))
 #define H5F_RDCC_W0(F)          (H5F_rdcc_w0(F))
 #define H5F_HAS_FEATURE(F,FL)   (H5F_has_feature(F,FL))
-#define H5F_RC_PAGE(F)         (H5F_rc_page(F))
+#define H5F_GRP_BTREE_SHARED(F) (H5F_grp_btree_shared(F))
 #endif /* H5F_PACKAGE */
 
 
@@ -418,7 +418,7 @@ H5_DLL hbool_t H5F_has_feature(const H5F_t *f, unsigned feature);
 H5_DLL size_t H5F_rdcc_nbytes(const H5F_t *f);
 H5_DLL size_t H5F_rdcc_nelmts(const H5F_t *f);
 H5_DLL double H5F_rdcc_w0(const H5F_t *f);
-H5_DLL struct H5RC_t *H5F_rc_page(const H5F_t *f);
+H5_DLL struct H5RC_t *H5F_grp_btree_shared(const H5F_t *f);
 
 /* Functions that operate on blocks of bytes wrt super block */
 H5_DLL herr_t H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr,