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

diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 00b9e8f..651dbca 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -91,7 +91,7 @@ typedef struct H5O_class_t {
     herr_t	(*reset)(void *);		 /*free nested data structs  */
     herr_t	(*free)(void *);		 /*free main data struct  */
     herr_t	(*get_share)(H5F_t*, const void*, struct H5O_shared_t*);
-    herr_t  (*set_share)(H5F_t*, void*, const struct H5O_shared_t*);
+    herr_t	(*set_share)(H5F_t*, void*, const struct H5O_shared_t*);
     herr_t	(*debug)(H5F_t*, const void*, FILE*, int, int);
 } H5O_class_t;
 
@@ -116,14 +116,14 @@ typedef struct H5O_t {
     H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
                             /* first field in structure */
     hbool_t	dirty;			/*out of data wrt disk		     */
-    int	version;		/*version number		     */
-    int	nlink;			/*link count			     */
+    int		version;		/*version number		     */
+    int		nlink;			/*link count			     */
     unsigned	nmesgs;			/*number of messages		     */
-    unsigned	alloc_nmesgs;	/*number of message slots	     */
-    H5O_mesg_t	*mesg;		/*array of messages		     */
+    unsigned	alloc_nmesgs;		/*number of message slots	     */
+    H5O_mesg_t	*mesg;			/*array of messages		     */
     unsigned	nchunks;		/*number of chunks		     */
-    unsigned	alloc_nchunks;	/*chunks allocated		     */
-    H5O_chunk_t *chunk;		/*array of chunks		     */
+    unsigned	alloc_nchunks;		/*chunks allocated		     */
+    H5O_chunk_t *chunk;			/*array of chunks		     */
 } H5O_t;
 
 /*
@@ -194,9 +194,9 @@ typedef struct H5O_efl_entry_t {
 
 typedef struct H5O_efl_t {
     haddr_t	heap_addr;		/*address of name heap		     */
-    int	nalloc;			/*number of slots allocated	     */
-    int	nused;			/*number of slots used		     */
-    H5O_efl_entry_t *slot;	/*array of external file entries     */
+    int	nalloc;				/*number of slots allocated	     */
+    int	nused;				/*number of slots used		     */
+    H5O_efl_entry_t *slot;		/*array of external file entries     */
 } H5O_efl_t;
 
 /*
@@ -227,10 +227,10 @@ typedef struct H5O_pline_t {
     size_t	nalloc;			/*num elements in `filter' array     */
     struct {
         H5Z_filter_t	id;		/*filter identification number	     */
-        unsigned		flags;		/*defn and invocation flags	     */
+        unsigned	flags;		/*defn and invocation flags	     */
         char		*name;		/*optional filter name		     */
         size_t		cd_nelmts;	/*number of elements in cd_values[]  */
-        unsigned		*cd_values;	/*client data values		     */
+        unsigned	*cd_values;	/*client data values		     */
     } *filter;				/*array of filters		     */
 } H5O_pline_t;
 
@@ -303,9 +303,15 @@ typedef struct H5O_stab_t {
 } H5O_stab_t;
 
 /*
+ * Modification time message (new format on disk).  The message is just a `time_t'.
+ */
+#define H5O_MTIME_NEW_ID	0x0012
+H5_DLLVAR const H5O_class_t H5O_MTIME_NEW[1];
+
+/*
  * Generic property list message.
  */
-#define H5O_PLIST_ID	0x0012
+#define H5O_PLIST_ID	0x0013
 H5_DLLVAR const H5O_class_t H5O_PLIST[1];
 
 /* operates on an H5P_genplist_t struct */
@@ -314,7 +320,7 @@ H5_DLLVAR const H5O_class_t H5O_PLIST[1];
 /*
  * Flexible parallel message
  */
-#define H5O_FPHDF5_ID	0x0013
+#define H5O_FPHDF5_ID	0x0014
 H5_DLLVAR const H5O_class_t H5O_FPHDF5[1];
 
 struct H5S_simple_t;
@@ -349,8 +355,13 @@ H5_DLL htri_t H5O_exists(H5G_entry_t *ent, const H5O_class_t *type,
 H5_DLL void *H5O_read(H5G_entry_t *ent, const H5O_class_t *type,
 		       int sequence, void *mesg);
 H5_DLL int H5O_modify(H5G_entry_t *ent, const H5O_class_t *type,
-			int overwrite, unsigned flags, const void *mesg);
+    int overwrite, unsigned flags, unsigned update_time, const void *mesg);
+H5_DLL H5O_t * H5O_protect(H5G_entry_t *ent);
+H5_DLL herr_t H5O_unprotect(H5G_entry_t *ent, H5O_t *oh);
+H5_DLL int H5O_append(H5F_t *f, H5O_t *oh, const H5O_class_t *type, 
+    unsigned flags, const void *mesg);
 H5_DLL herr_t H5O_touch(H5G_entry_t *ent, hbool_t force);
+H5_DLL herr_t H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force);
 H5_DLL herr_t H5O_remove(H5G_entry_t *ent, const H5O_class_t *type,
 			  int sequence);
 H5_DLL herr_t H5O_reset(const H5O_class_t *type, void *native);