[svn-r6252] Purpose:

    Lots of performance improvements & a couple new internal API interfaces.

Description:
    Performance Improvements:
        - Cached file offset & length sizes in shared file struct, to avoid
            constantly looking them up in the FCPL.
        - Generic property improvements:
            - Added "revision" number to generic property classes to speed
                up comparisons.
            - Changed method of storing properties from using a hash-table
                to the TBBT routines in the library.
            - Share the propery names between classes and the lists derived
                from them.
            - Removed redundant 'def_value' buffer from each property.
            - Switching code to use a "copy on write" strategy for
                properties in each list, where the properties in each list
                are shared with the properties in the class, until a
                property's value is changed in a list.
        - Fixed error in layout code which was allocating too many buffers.
        - Redefined public macros of the form (H5open()/H5check, <variable>)
            internally to only be (<variable>), avoiding innumerable useless
            calls to H5open() and H5check_version().
        - Reuse already zeroed buffers in H5F_contig_fill instead of
            constantly re-zeroing them.
        - Don't write fill values if writing entire dataset.
        - Use gettimeofday() system call instead of time() system when
            checking the modification time of a dataset.
        - Added reference counted string API and use it for tracking the
            names of objects opening in a file (for the ID->name code).
        - Removed redundant H5P_get() calls in B-tree routines.
        - Redefine H5T datatype macros internally to the library, to avoid
            calling H5check redundantly.
        - Keep dataspace information for dataset locally instead of reading
            from disk each time.  Added new module to track open objects
            in a file, to allow this (which will be useful eventually for
            some FPH5 metadata caching issues).
        - Remove H5AC_find macro which was inlining metadata cache lookups,
            and call function instead.
        - Remove redundant memset() calls from H5G_namei() routine.
        - Remove redundant checking of object type when locating objects
            in metadata cache and rely on the address only.
        - Create default dataset object to use when default dataset creation
            property list is used to create datasets, bypassing querying
            for all the property list values.
        - Use default I/O vector size when performing raw data with the
            default dataset transfer property list, instead of querying for
            I/O vector size.
        - Remove H5P_DEFAULT internally to the library, replacing it with
            more specific default property list based on the type of
            property list needed.
        - Remove redundant memset() calls in object header message (H5O*)
            routines.
        - Remove redunant memset() calls in data I/O routines.
        - Split free-list allocation routines into malloc() and calloc()-
            like routines, instead of one combined routine.
        - Remove lots of indirection in H5O*() routines.
        - Simplify metadata cache entry comparison routine (used when
            flushing entire cache out).
        - Only enable metadata cache statistics when H5AC_DEBUG is turned
            on, instead of always tracking them.
        - Simplify address comparison macro (H5F_addr_eq).
        - Remove redundant metadata cache entry protections during dataset
            creation by protecting the object header once and making all
            the modifications necessary for the dataset creation before
            unprotecting it.
        - Reduce # of "number of element in extent" computations performed
            by computing and storing the value during dataspace creation.
        - Simplify checking for group location's file information, when file
            has not been involving in file-mounting operations.
        - Use binary encoding for modification time, instead of ASCII.
        - Hoist H5HL_peek calls (to get information in a local heap)
            out of loops in many group routine.
        - Use static variable for iterators of selections, instead of
            dynamically allocation them each time.
        - Lookup & insert new entries in one step, avoiding traversing
            group's B-tree twice.
        - Fixed memory leak in H5Gget_objname_idx() routine (tangential to
            performance improvements, but fixed along the way).
        - Use free-list for reference counted strings.
        - Don't bother copying object names into cached group entries,
            since they are re-created when an object is opened.

        The benchmark I used to measure these results created several thousand
        small (2K) datasets in a file and wrote out the data for them.  This is
        Elena's "regular.c" benchmark.

        These changes resulted in approximately ~4.3x speedup of the
        development branch when compared to the previous code in the
        development branch and ~1.4x speedup compared to the release
        branch.

        Additionally, these changes reduce the total memory used (code and
        data) by the development branch by ~800KB, bringing the development
        branch back into the same ballpark as the release branch.

        I'll send out a more detailed description of the benchmark results
        as a followup note.

    New internal API routines:
        Added "reference counted strings" API for tracking strings that get
            used by multiple owners without duplicating the strings.
        Added "ternary search tree" API for text->object mappings.

Platforms tested:
    Tested h5committest {arabica (fortran), eirene (fortran, C++)
	modi4 (parallel, fortran)}
    Other platforms/configurations tested?
        FreeBSD 4.7 (sleipnir) serial & parallel
        Solaris 2.6 (baldric) serial

1 files changed, 91 insertions, 83 deletions

diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 2bfc7da..a96d2bb 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -196,13 +196,21 @@ typedef herr_t (*H5T_overflow_t)(hid_t src_id, hid_t dst_id,
 extern "C" {
 #endif
 
+/* When this header is included from H5Tprivate.h, don't make calls to H5open() */
+#undef H5OPEN
+#ifndef _H5Tprivate_H
+#define H5OPEN          H5open(),
+#else   /* _H5Tprivate_H */
+#define H5OPEN
+#endif  /* _H5Tprivate_H */
+
 /*
  * The IEEE floating point types in various byte orders.
  */
-#define H5T_IEEE_F32BE		(H5open(), H5T_IEEE_F32BE_g)
-#define H5T_IEEE_F32LE		(H5open(), H5T_IEEE_F32LE_g)
-#define H5T_IEEE_F64BE		(H5open(), H5T_IEEE_F64BE_g)
-#define H5T_IEEE_F64LE		(H5open(), H5T_IEEE_F64LE_g)
+#define H5T_IEEE_F32BE		(H5OPEN H5T_IEEE_F32BE_g)
+#define H5T_IEEE_F32LE		(H5OPEN H5T_IEEE_F32LE_g)
+#define H5T_IEEE_F64BE		(H5OPEN H5T_IEEE_F64BE_g)
+#define H5T_IEEE_F64LE		(H5OPEN H5T_IEEE_F64LE_g)
 H5_DLLVAR hid_t H5T_IEEE_F32BE_g;
 H5_DLLVAR hid_t H5T_IEEE_F32LE_g;
 H5_DLLVAR hid_t H5T_IEEE_F64BE_g;
@@ -212,32 +220,32 @@ H5_DLLVAR hid_t H5T_IEEE_F64LE_g;
  * These are "standard" types.  For instance, signed (2's complement) and
  * unsigned integers of various sizes and byte orders.
  */
-#define H5T_STD_I8BE		(H5open(), H5T_STD_I8BE_g)
-#define H5T_STD_I8LE		(H5open(), H5T_STD_I8LE_g)
-#define H5T_STD_I16BE		(H5open(), H5T_STD_I16BE_g)
-#define H5T_STD_I16LE		(H5open(), H5T_STD_I16LE_g)
-#define H5T_STD_I32BE		(H5open(), H5T_STD_I32BE_g)
-#define H5T_STD_I32LE		(H5open(), H5T_STD_I32LE_g)
-#define H5T_STD_I64BE		(H5open(), H5T_STD_I64BE_g)
-#define H5T_STD_I64LE		(H5open(), H5T_STD_I64LE_g)
-#define H5T_STD_U8BE		(H5open(), H5T_STD_U8BE_g)
-#define H5T_STD_U8LE		(H5open(), H5T_STD_U8LE_g)
-#define H5T_STD_U16BE		(H5open(), H5T_STD_U16BE_g)
-#define H5T_STD_U16LE		(H5open(), H5T_STD_U16LE_g)
-#define H5T_STD_U32BE		(H5open(), H5T_STD_U32BE_g)
-#define H5T_STD_U32LE		(H5open(), H5T_STD_U32LE_g)
-#define H5T_STD_U64BE		(H5open(), H5T_STD_U64BE_g)
-#define H5T_STD_U64LE		(H5open(), H5T_STD_U64LE_g)
-#define H5T_STD_B8BE		(H5open(), H5T_STD_B8BE_g)
-#define H5T_STD_B8LE		(H5open(), H5T_STD_B8LE_g)
-#define H5T_STD_B16BE		(H5open(), H5T_STD_B16BE_g)
-#define H5T_STD_B16LE		(H5open(), H5T_STD_B16LE_g)
-#define H5T_STD_B32BE		(H5open(), H5T_STD_B32BE_g)
-#define H5T_STD_B32LE		(H5open(), H5T_STD_B32LE_g)
-#define H5T_STD_B64BE		(H5open(), H5T_STD_B64BE_g)
-#define H5T_STD_B64LE		(H5open(), H5T_STD_B64LE_g)
-#define H5T_STD_REF_OBJ	    (H5open(), H5T_STD_REF_OBJ_g)
-#define H5T_STD_REF_DSETREG (H5open(), H5T_STD_REF_DSETREG_g)
+#define H5T_STD_I8BE		(H5OPEN H5T_STD_I8BE_g)
+#define H5T_STD_I8LE		(H5OPEN H5T_STD_I8LE_g)
+#define H5T_STD_I16BE		(H5OPEN H5T_STD_I16BE_g)
+#define H5T_STD_I16LE		(H5OPEN H5T_STD_I16LE_g)
+#define H5T_STD_I32BE		(H5OPEN H5T_STD_I32BE_g)
+#define H5T_STD_I32LE		(H5OPEN H5T_STD_I32LE_g)
+#define H5T_STD_I64BE		(H5OPEN H5T_STD_I64BE_g)
+#define H5T_STD_I64LE		(H5OPEN H5T_STD_I64LE_g)
+#define H5T_STD_U8BE		(H5OPEN H5T_STD_U8BE_g)
+#define H5T_STD_U8LE		(H5OPEN H5T_STD_U8LE_g)
+#define H5T_STD_U16BE		(H5OPEN H5T_STD_U16BE_g)
+#define H5T_STD_U16LE		(H5OPEN H5T_STD_U16LE_g)
+#define H5T_STD_U32BE		(H5OPEN H5T_STD_U32BE_g)
+#define H5T_STD_U32LE		(H5OPEN H5T_STD_U32LE_g)
+#define H5T_STD_U64BE		(H5OPEN H5T_STD_U64BE_g)
+#define H5T_STD_U64LE		(H5OPEN H5T_STD_U64LE_g)
+#define H5T_STD_B8BE		(H5OPEN H5T_STD_B8BE_g)
+#define H5T_STD_B8LE		(H5OPEN H5T_STD_B8LE_g)
+#define H5T_STD_B16BE		(H5OPEN H5T_STD_B16BE_g)
+#define H5T_STD_B16LE		(H5OPEN H5T_STD_B16LE_g)
+#define H5T_STD_B32BE		(H5OPEN H5T_STD_B32BE_g)
+#define H5T_STD_B32LE		(H5OPEN H5T_STD_B32LE_g)
+#define H5T_STD_B64BE		(H5OPEN H5T_STD_B64BE_g)
+#define H5T_STD_B64LE		(H5OPEN H5T_STD_B64LE_g)
+#define H5T_STD_REF_OBJ	        (H5OPEN H5T_STD_REF_OBJ_g)
+#define H5T_STD_REF_DSETREG     (H5OPEN H5T_STD_REF_DSETREG_g)
 H5_DLLVAR hid_t H5T_STD_I8BE_g;
 H5_DLLVAR hid_t H5T_STD_I8LE_g;
 H5_DLLVAR hid_t H5T_STD_I16BE_g;
@@ -268,10 +276,10 @@ H5_DLLVAR hid_t H5T_STD_REF_DSETREG_g;
 /*
  * Types which are particular to Unix.
  */
-#define H5T_UNIX_D32BE		(H5open(), H5T_UNIX_D32BE_g)
-#define H5T_UNIX_D32LE		(H5open(), H5T_UNIX_D32LE_g)
-#define H5T_UNIX_D64BE		(H5open(), H5T_UNIX_D64BE_g)
-#define H5T_UNIX_D64LE		(H5open(), H5T_UNIX_D64LE_g)
+#define H5T_UNIX_D32BE		(H5OPEN H5T_UNIX_D32BE_g)
+#define H5T_UNIX_D32LE		(H5OPEN H5T_UNIX_D32LE_g)
+#define H5T_UNIX_D64BE		(H5OPEN H5T_UNIX_D64BE_g)
+#define H5T_UNIX_D64LE		(H5OPEN H5T_UNIX_D64LE_g)
 H5_DLLVAR hid_t H5T_UNIX_D32BE_g;
 H5_DLLVAR hid_t H5T_UNIX_D32LE_g;
 H5_DLLVAR hid_t H5T_UNIX_D64BE_g;
@@ -281,13 +289,13 @@ H5_DLLVAR hid_t H5T_UNIX_D64LE_g;
  * Types particular to the C language.  String types use `bytes' instead
  * of `bits' as their size.
  */
-#define H5T_C_S1		(H5open(), H5T_C_S1_g)
+#define H5T_C_S1		(H5OPEN H5T_C_S1_g)
 H5_DLLVAR hid_t H5T_C_S1_g;
 
 /*
  * Types particular to Fortran.
  */
-#define H5T_FORTRAN_S1		(H5open(), H5T_FORTRAN_S1_g)
+#define H5T_FORTRAN_S1		(H5OPEN H5T_FORTRAN_S1_g)
 H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
 
 /*
@@ -357,29 +365,29 @@ H5_DLLVAR hid_t H5T_FORTRAN_S1_g;
  * same as `LONG' and `DOUBLE' respectively.
  */
 #define H5T_NATIVE_CHAR		(CHAR_MIN?H5T_NATIVE_SCHAR:H5T_NATIVE_UCHAR)
-#define H5T_NATIVE_SCHAR        (H5open(), H5T_NATIVE_SCHAR_g)
-#define H5T_NATIVE_UCHAR        (H5open(), H5T_NATIVE_UCHAR_g)
-#define H5T_NATIVE_SHORT        (H5open(), H5T_NATIVE_SHORT_g)
-#define H5T_NATIVE_USHORT       (H5open(), H5T_NATIVE_USHORT_g)
-#define H5T_NATIVE_INT          (H5open(), H5T_NATIVE_INT_g)
-#define H5T_NATIVE_UINT         (H5open(), H5T_NATIVE_UINT_g)
-#define H5T_NATIVE_LONG         (H5open(), H5T_NATIVE_LONG_g)
-#define H5T_NATIVE_ULONG        (H5open(), H5T_NATIVE_ULONG_g)
-#define H5T_NATIVE_LLONG        (H5open(), H5T_NATIVE_LLONG_g)
-#define H5T_NATIVE_ULLONG       (H5open(), H5T_NATIVE_ULLONG_g)
-#define H5T_NATIVE_FLOAT        (H5open(), H5T_NATIVE_FLOAT_g)
-#define H5T_NATIVE_DOUBLE       (H5open(), H5T_NATIVE_DOUBLE_g)
-#define H5T_NATIVE_LDOUBLE	(H5open(), H5T_NATIVE_LDOUBLE_g)
-#define H5T_NATIVE_B8		(H5open(), H5T_NATIVE_B8_g)
-#define H5T_NATIVE_B16		(H5open(), H5T_NATIVE_B16_g)
-#define H5T_NATIVE_B32		(H5open(), H5T_NATIVE_B32_g)
-#define H5T_NATIVE_B64		(H5open(), H5T_NATIVE_B64_g)
-#define H5T_NATIVE_OPAQUE       (H5open(), H5T_NATIVE_OPAQUE_g)
-#define H5T_NATIVE_HADDR	(H5open(), H5T_NATIVE_HADDR_g)
-#define H5T_NATIVE_HSIZE	(H5open(), H5T_NATIVE_HSIZE_g)
-#define H5T_NATIVE_HSSIZE	(H5open(), H5T_NATIVE_HSSIZE_g)
-#define H5T_NATIVE_HERR		(H5open(), H5T_NATIVE_HERR_g)
-#define H5T_NATIVE_HBOOL	(H5open(), H5T_NATIVE_HBOOL_g)
+#define H5T_NATIVE_SCHAR        (H5OPEN H5T_NATIVE_SCHAR_g)
+#define H5T_NATIVE_UCHAR        (H5OPEN H5T_NATIVE_UCHAR_g)
+#define H5T_NATIVE_SHORT        (H5OPEN H5T_NATIVE_SHORT_g)
+#define H5T_NATIVE_USHORT       (H5OPEN H5T_NATIVE_USHORT_g)
+#define H5T_NATIVE_INT          (H5OPEN H5T_NATIVE_INT_g)
+#define H5T_NATIVE_UINT         (H5OPEN H5T_NATIVE_UINT_g)
+#define H5T_NATIVE_LONG         (H5OPEN H5T_NATIVE_LONG_g)
+#define H5T_NATIVE_ULONG        (H5OPEN H5T_NATIVE_ULONG_g)
+#define H5T_NATIVE_LLONG        (H5OPEN H5T_NATIVE_LLONG_g)
+#define H5T_NATIVE_ULLONG       (H5OPEN H5T_NATIVE_ULLONG_g)
+#define H5T_NATIVE_FLOAT        (H5OPEN H5T_NATIVE_FLOAT_g)
+#define H5T_NATIVE_DOUBLE       (H5OPEN H5T_NATIVE_DOUBLE_g)
+#define H5T_NATIVE_LDOUBLE	(H5OPEN H5T_NATIVE_LDOUBLE_g)
+#define H5T_NATIVE_B8		(H5OPEN H5T_NATIVE_B8_g)
+#define H5T_NATIVE_B16		(H5OPEN H5T_NATIVE_B16_g)
+#define H5T_NATIVE_B32		(H5OPEN H5T_NATIVE_B32_g)
+#define H5T_NATIVE_B64		(H5OPEN H5T_NATIVE_B64_g)
+#define H5T_NATIVE_OPAQUE       (H5OPEN H5T_NATIVE_OPAQUE_g)
+#define H5T_NATIVE_HADDR	(H5OPEN H5T_NATIVE_HADDR_g)
+#define H5T_NATIVE_HSIZE	(H5OPEN H5T_NATIVE_HSIZE_g)
+#define H5T_NATIVE_HSSIZE	(H5OPEN H5T_NATIVE_HSSIZE_g)
+#define H5T_NATIVE_HERR		(H5OPEN H5T_NATIVE_HERR_g)
+#define H5T_NATIVE_HBOOL	(H5OPEN H5T_NATIVE_HBOOL_g)
 H5_DLLVAR hid_t H5T_NATIVE_SCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_UCHAR_g;
 H5_DLLVAR hid_t H5T_NATIVE_SHORT_g;
@@ -405,12 +413,12 @@ H5_DLLVAR hid_t H5T_NATIVE_HERR_g;
 H5_DLLVAR hid_t H5T_NATIVE_HBOOL_g;
 
 /* C9x integer types */
-#define H5T_NATIVE_INT8			(H5open(), H5T_NATIVE_INT8_g)
-#define H5T_NATIVE_UINT8		(H5open(), H5T_NATIVE_UINT8_g)
-#define H5T_NATIVE_INT_LEAST8		(H5open(), H5T_NATIVE_INT_LEAST8_g)
-#define H5T_NATIVE_UINT_LEAST8		(H5open(), H5T_NATIVE_UINT_LEAST8_g)
-#define H5T_NATIVE_INT_FAST8 		(H5open(), H5T_NATIVE_INT_FAST8_g)
-#define H5T_NATIVE_UINT_FAST8		(H5open(), H5T_NATIVE_UINT_FAST8_g)
+#define H5T_NATIVE_INT8			(H5OPEN H5T_NATIVE_INT8_g)
+#define H5T_NATIVE_UINT8		(H5OPEN H5T_NATIVE_UINT8_g)
+#define H5T_NATIVE_INT_LEAST8		(H5OPEN H5T_NATIVE_INT_LEAST8_g)
+#define H5T_NATIVE_UINT_LEAST8		(H5OPEN H5T_NATIVE_UINT_LEAST8_g)
+#define H5T_NATIVE_INT_FAST8 		(H5OPEN H5T_NATIVE_INT_FAST8_g)
+#define H5T_NATIVE_UINT_FAST8		(H5OPEN H5T_NATIVE_UINT_FAST8_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT8_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST8_g;
@@ -418,12 +426,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST8_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST8_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST8_g;
 
-#define H5T_NATIVE_INT16		(H5open(), H5T_NATIVE_INT16_g)
-#define H5T_NATIVE_UINT16		(H5open(), H5T_NATIVE_UINT16_g)
-#define H5T_NATIVE_INT_LEAST16		(H5open(), H5T_NATIVE_INT_LEAST16_g)
-#define H5T_NATIVE_UINT_LEAST16		(H5open(), H5T_NATIVE_UINT_LEAST16_g)
-#define H5T_NATIVE_INT_FAST16		(H5open(), H5T_NATIVE_INT_FAST16_g)
-#define H5T_NATIVE_UINT_FAST16		(H5open(), H5T_NATIVE_UINT_FAST16_g)
+#define H5T_NATIVE_INT16		(H5OPEN H5T_NATIVE_INT16_g)
+#define H5T_NATIVE_UINT16		(H5OPEN H5T_NATIVE_UINT16_g)
+#define H5T_NATIVE_INT_LEAST16		(H5OPEN H5T_NATIVE_INT_LEAST16_g)
+#define H5T_NATIVE_UINT_LEAST16		(H5OPEN H5T_NATIVE_UINT_LEAST16_g)
+#define H5T_NATIVE_INT_FAST16		(H5OPEN H5T_NATIVE_INT_FAST16_g)
+#define H5T_NATIVE_UINT_FAST16		(H5OPEN H5T_NATIVE_UINT_FAST16_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT16_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST16_g;
@@ -431,12 +439,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST16_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST16_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST16_g;
 
-#define H5T_NATIVE_INT32		(H5open(), H5T_NATIVE_INT32_g)
-#define H5T_NATIVE_UINT32		(H5open(), H5T_NATIVE_UINT32_g)
-#define H5T_NATIVE_INT_LEAST32		(H5open(), H5T_NATIVE_INT_LEAST32_g)
-#define H5T_NATIVE_UINT_LEAST32		(H5open(), H5T_NATIVE_UINT_LEAST32_g)
-#define H5T_NATIVE_INT_FAST32		(H5open(), H5T_NATIVE_INT_FAST32_g)
-#define H5T_NATIVE_UINT_FAST32		(H5open(), H5T_NATIVE_UINT_FAST32_g)
+#define H5T_NATIVE_INT32		(H5OPEN H5T_NATIVE_INT32_g)
+#define H5T_NATIVE_UINT32		(H5OPEN H5T_NATIVE_UINT32_g)
+#define H5T_NATIVE_INT_LEAST32		(H5OPEN H5T_NATIVE_INT_LEAST32_g)
+#define H5T_NATIVE_UINT_LEAST32		(H5OPEN H5T_NATIVE_UINT_LEAST32_g)
+#define H5T_NATIVE_INT_FAST32		(H5OPEN H5T_NATIVE_INT_FAST32_g)
+#define H5T_NATIVE_UINT_FAST32		(H5OPEN H5T_NATIVE_UINT_FAST32_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT32_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST32_g;
@@ -444,12 +452,12 @@ H5_DLLVAR hid_t H5T_NATIVE_UINT_LEAST32_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_FAST32_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT_FAST32_g;
 
-#define H5T_NATIVE_INT64		(H5open(), H5T_NATIVE_INT64_g)
-#define H5T_NATIVE_UINT64		(H5open(), H5T_NATIVE_UINT64_g)
-#define H5T_NATIVE_INT_LEAST64		(H5open(), H5T_NATIVE_INT_LEAST64_g)
-#define H5T_NATIVE_UINT_LEAST64 	(H5open(), H5T_NATIVE_UINT_LEAST64_g)
-#define H5T_NATIVE_INT_FAST64		(H5open(), H5T_NATIVE_INT_FAST64_g)
-#define H5T_NATIVE_UINT_FAST64		(H5open(), H5T_NATIVE_UINT_FAST64_g)
+#define H5T_NATIVE_INT64		(H5OPEN H5T_NATIVE_INT64_g)
+#define H5T_NATIVE_UINT64		(H5OPEN H5T_NATIVE_UINT64_g)
+#define H5T_NATIVE_INT_LEAST64		(H5OPEN H5T_NATIVE_INT_LEAST64_g)
+#define H5T_NATIVE_UINT_LEAST64 	(H5OPEN H5T_NATIVE_UINT_LEAST64_g)
+#define H5T_NATIVE_INT_FAST64		(H5OPEN H5T_NATIVE_INT_FAST64_g)
+#define H5T_NATIVE_UINT_FAST64		(H5OPEN H5T_NATIVE_UINT_FAST64_g)
 H5_DLLVAR hid_t H5T_NATIVE_INT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_UINT64_g;
 H5_DLLVAR hid_t H5T_NATIVE_INT_LEAST64_g;