[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, 7 insertions, 28 deletions

diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 7f2a0ce..cfef073 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -147,44 +147,24 @@
 typedef struct H5D_t {
     H5G_entry_t         ent;            /* cached object header stuff   */
     H5T_t              *type;           /* datatype of this dataset     */
+    H5S_t              *space;          /* dataspace of this dataset    */
     hid_t               dcpl_id;        /* dataset creation property id */
     H5O_layout_t        layout;         /* data layout                  */
+    /* Cache some frequently accessed values from the DCPL */
+    H5O_efl_t           efl;            /* External file list information */
+    H5D_alloc_time_t    alloc_time;     /* Dataset allocation time      */
+    H5D_fill_time_t	fill_time;	/* Dataset fill value writing time */
+    H5O_fill_t          fill;           /* Dataset fill value information */
 } H5D_t;
   
 /* Functions defined in H5D.c */
 H5_DLL herr_t H5D_init(void);
-
-H5_DLL herr_t H5D_update_entry_cache(H5F_t *f, H5G_entry_t *ent, H5G_entry_t *loc,
-                                     const char *name, const H5S_t *space,
-                                     H5P_genplist_t *new_plist, H5O_layout_t *layout,
-                                     H5T_t *type, hbool_t allocate_header,
-                                     haddr_t header);
-H5_DLL herr_t H5D_update_external_storage_cache(H5F_t *file, H5G_entry_t *ent,
-                                                H5O_efl_t *efl, H5O_layout_t *layout);
-
-H5_DLL H5D_t *H5D_create(H5G_entry_t *loc, const char *name, 
-                          const H5T_t *type, const H5S_t *space, 
-                          hid_t dcpl_id);
-H5_DLL H5D_t *H5D_open(H5G_entry_t *loc, const char *name);
+H5_DLL hid_t H5D_open(H5G_entry_t *ent);
 H5_DLL herr_t H5D_close(H5D_t *dataset);
 H5_DLL htri_t H5D_isa(H5G_entry_t *ent);
-H5_DLL herr_t H5D_read(H5D_t *dataset, const H5T_t *mem_type,
-			const H5S_t *mem_space, const H5S_t *file_space,
-			hid_t dset_xfer_plist, void *buf/*out*/);
-H5_DLL herr_t H5D_write(H5D_t *dataset, const H5T_t *mem_type,
-			 const H5S_t *mem_space, const H5S_t *file_space,
-			 hid_t dset_xfer_plist, const void *buf);
 H5_DLL herr_t H5D_extend(H5D_t *dataset, const hsize_t *size);
 H5_DLL H5G_entry_t *H5D_entof(H5D_t *dataset);
 H5_DLL H5T_t *H5D_typeof(H5D_t *dset);
-H5_DLL H5S_t *H5D_get_space(H5D_t *dset);
-H5_DLL H5D_t * H5D_open_oid(H5G_entry_t *ent);
-H5_DLL H5F_t * H5D_get_file(const H5D_t *dset);
-H5_DLL hsize_t H5D_get_storage_size(H5D_t *dset);
-H5_DLL haddr_t H5D_get_offset(H5D_t *dset);
-H5_DLL void *H5D_vlen_get_buf_size_alloc(size_t size, void *info);
-H5_DLL herr_t H5D_vlen_get_buf_size(void *elem, hid_t type_id, hsize_t ndim, 
-                                     hssize_t *point, void *op_data);
 H5_DLL herr_t H5D_crt_copy(hid_t new_plist_t, hid_t old_plist_t, 
                             void *copy_data);
 H5_DLL herr_t H5D_crt_close(hid_t dxpl_id, void *close_data);
@@ -192,7 +172,6 @@ H5_DLL herr_t H5D_xfer_create(hid_t dxpl_id, void *create_data);
 H5_DLL herr_t H5D_xfer_copy(hid_t new_plist_id, hid_t old_plist_id, 
                              void *copy_data);
 H5_DLL herr_t H5D_xfer_close(hid_t dxpl_id, void *close_data);
-H5_DLL herr_t H5D_set_extent(H5D_t *dataset, const hsize_t *size);
 H5_DLL herr_t H5D_flush(H5F_t *f);