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

diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 1daaf04..0c267ac 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -103,16 +103,16 @@ typedef struct H5S_conv_t {
     
     /* Read from file to application w/o intermediate scratch buffer */
     herr_t (*read)(H5F_t *f, const struct H5O_layout_t *layout,
-                   H5P_genplist_t *dc_plist, size_t elmt_size,
-		   const H5S_t *file_space, const H5S_t *mem_space,
-		   hid_t dxpl_id, void *buf/*out*/);
+           H5P_genplist_t *dc_plist, const H5O_efl_t *efl,
+           size_t elmt_size, const H5S_t *file_space,
+           const H5S_t *mem_space, hid_t dxpl_id, void *buf/*out*/);
 
 
     /* Write directly from app buffer to file */
     herr_t (*write)(H5F_t *f, struct H5O_layout_t *layout,
-                   H5P_genplist_t *dc_plist, size_t elmt_size,
-		   const H5S_t *file_space, const H5S_t *mem_space,
-		   hid_t dxpl_id, const void *buf);
+           H5P_genplist_t *dc_plist, const H5O_efl_t *efl,
+           size_t elmt_size, const H5S_t *file_space,
+           const H5S_t *mem_space, hid_t dxpl_id, const void *buf);
     
 #ifdef H5S_DEBUG
     struct {
@@ -150,7 +150,9 @@ H5_DLL int H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[]/*out*/,
 					hsize_t max_dims[]/*out*/);
 H5_DLL herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
 		       const hsize_t *max);
-H5_DLL herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space);
+H5_DLL herr_t H5S_modify(struct H5G_entry_t *ent, const H5S_t *space,
+        hbool_t update_time);
+H5_DLL herr_t H5S_append(H5F_t *f, H5O_t *oh, const H5S_t *ds);
 H5_DLL H5S_t *H5S_read(struct H5G_entry_t *ent);
 H5_DLL int H5S_cmp(const H5S_t *ds1, const H5S_t *ds2);
 H5_DLL htri_t H5S_is_simple(const H5S_t *sdim);
@@ -169,13 +171,13 @@ H5_DLL herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space,
 H5_DLL herr_t H5S_select_fill(void *fill, size_t fill_size,
                                 const H5S_t *space, void *buf);
 H5_DLL herr_t H5S_select_fscat (H5F_t *f, struct H5O_layout_t *layout,
-        H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
-        H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id,
-        const void *_buf);
+        H5P_genplist_t *dc_plist, const H5O_efl_t *efl, size_t elmt_size,
+        const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts,
+        hid_t dxpl_id, const void *_buf);
 H5_DLL hsize_t H5S_select_fgath (H5F_t *f, const struct H5O_layout_t *layout,
-        H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
-        H5S_sel_iter_t *file_iter, hsize_t nelmts, hid_t dxpl_id,
-        void *buf);
+        H5P_genplist_t *dc_plist, const H5O_efl_t *efl, size_t elmt_size,
+        const H5S_t *file_space, H5S_sel_iter_t *file_iter, hsize_t nelmts,
+        hid_t dxpl_id, void *buf);
 H5_DLL herr_t H5S_select_mscat (const void *_tscat_buf, size_t elmt_size,
         const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts,
         hid_t dxpl_id, void *_buf/*out*/);
@@ -183,11 +185,13 @@ H5_DLL hsize_t H5S_select_mgath (const void *_buf, size_t elmt_size,
         const H5S_t *space, H5S_sel_iter_t *iter, hsize_t nelmts,
         hid_t dxpl_id, void *_tgath_buf/*out*/);
 H5_DLL herr_t H5S_select_read(H5F_t *f, const struct H5O_layout_t *layout,
-        H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
-        const H5S_t *mem_space, hid_t dxpl_id, void *buf/*out*/);
+        H5P_genplist_t *dc_plist, const H5O_efl_t *efl, size_t elmt_size,
+        const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
+        void *buf/*out*/);
 H5_DLL herr_t H5S_select_write(H5F_t *f, struct H5O_layout_t *layout,
-        H5P_genplist_t *dc_plist, size_t elmt_size, const H5S_t *file_space,
-        const H5S_t *mem_space, hid_t dxpl_id, const void *buf/*out*/);
+        H5P_genplist_t *dc_plist, const H5O_efl_t *efl, size_t elmt_size,
+        const H5S_t *file_space, const H5S_t *mem_space, hid_t dxpl_id,
+        const void *buf/*out*/);
 
 /* Needed for internal use of selections in H5Fistore code */
 H5_DLL herr_t H5S_select_all(H5S_t *space, unsigned rel_prev);
@@ -200,6 +204,7 @@ H5_DLL herr_t H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, const hssize
 H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f,
 				    const struct H5O_layout_t *layout,
                                     H5P_genplist_t *dc_plist,
+                                    const H5O_efl_t *efl,
 				    size_t elmt_size, const H5S_t *file_space,
 				    const H5S_t *mem_space, hid_t dxpl_id,
 				    void *buf/*out*/);
@@ -208,6 +213,7 @@ H5_DLL herr_t H5S_mpio_spaces_read(H5F_t *f,
 H5_DLL herr_t H5S_mpio_spaces_write(H5F_t *f,
 				    struct H5O_layout_t *layout,
                                     H5P_genplist_t *dc_plist,
+                                    const H5O_efl_t *efl,
 				    size_t elmt_size, const H5S_t *file_space,
 				    const H5S_t *mem_space, hid_t dxpl_id,
 				    const void *buf);