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

diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 0444d2c..7f389ec 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -283,8 +283,8 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
     case H5T_CONV_INIT:							      \
 	/* Sanity check and initialize statistics */			      \
 	cdata->need_bkg = H5T_BKG_NO;					      \
-	if (NULL==(st=H5I_object_verify(src_id,H5I_DATATYPE)) ||	      \
-                NULL==(dt=H5I_object_verify(dst_id,H5I_DATATYPE))) {	      \
+	if (NULL==(st=H5I_object(src_id)) ||	                	      \
+                NULL==(dt=H5I_object(dst_id))) {	        	      \
 	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,		      \
 			  "unable to dereference data type object ID");	      \
 	}								      \
@@ -292,13 +292,13 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
 	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL,		      \
 			  "disagreement about data type size");		      \
 	}								      \
-    CI_ALLOC_PRIV           \
+	CI_ALLOC_PRIV	                                                      \
 	break;								      \
 									      \
     case H5T_CONV_FREE:							      \
 	/* Print and free statistics */					      \
 	CI_PRINT_STATS(STYPE,DTYPE);					      \
-    CI_FREE_PRIV                                        \
+	CI_FREE_PRIV	                                                      \
 	break;								      \
 									      \
     case H5T_CONV_CONV:							      \
@@ -488,8 +488,8 @@ H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
     switch (cdata->command) {
     case H5T_CONV_INIT:
 	/* Capability query */
-	if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+	if (NULL == (src = H5I_object(src_id)) ||
+                NULL == (dst = H5I_object(dst_id)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	if (src->size != dst->size ||
                 0 != src->u.atomic.offset ||
@@ -528,8 +528,8 @@ H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     case H5T_CONV_CONV:
 	/* The conversion */
-	if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+	if (NULL == (src = H5I_object(src_id)) ||
+                NULL == (dst = H5I_object(dst_id)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
         buf_stride = buf_stride ? buf_stride : src->size;
@@ -872,8 +872,8 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
     switch (cdata->command) {
     case H5T_CONV_INIT:
 	/* Capability query */
-	if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+	if (NULL == (src = H5I_object(src_id)) ||
+                NULL == (dst = H5I_object(dst_id)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	if (src->size != dst->size || 0 != src->u.atomic.offset ||
                 0 != dst->u.atomic.offset ||
@@ -909,8 +909,8 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
     case H5T_CONV_CONV:
 	/* The conversion */
-	if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+	if (NULL == (src = H5I_object(src_id)) ||
+                NULL == (dst = H5I_object(dst_id)))
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
         buf_stride = buf_stride ? buf_stride : src->size;
@@ -974,8 +974,8 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
     switch(cdata->command) {
         case H5T_CONV_INIT:
             /* Capability query */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             if (H5T_ORDER_LE!=src->u.atomic.order &&
                     H5T_ORDER_BE!=src->u.atomic.order)
@@ -991,8 +991,8 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the data types */
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==(dst=H5I_object(dst_id)))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /*
@@ -1339,8 +1339,8 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
              * otherwise initialize the `priv' field of `cdata' with information
              * that remains (almost) constant for this conversion path.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_COMPOUND==src->type);
             assert (H5T_COMPOUND==dst->type);
@@ -1364,8 +1364,8 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             /*
              * Conversion.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (priv);
             assert (bkg && cdata->need_bkg);
@@ -1571,8 +1571,8 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
              * otherwise initialize the `priv' field of `cdata' with information
              * that remains (almost) constant for this conversion path.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_COMPOUND==src->type);
             assert (H5T_COMPOUND==dst->type);
@@ -1638,8 +1638,8 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
             /*
              * Conversion.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /* Update cached data if necessary */
@@ -1934,8 +1934,8 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
              * the `priv' field of `cdata' with information about the underlying
              * integer conversion.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_ENUM==src->type);
             assert (H5T_ENUM==dst->type);
@@ -1959,8 +1959,8 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             break;
 
         case H5T_CONV_CONV:
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_ENUM==src->type);
             assert (H5T_ENUM==dst->type);
@@ -2132,8 +2132,8 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
              * information that remains (almost) constant for this
              * conversion path.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_VLEN==src->type);
             assert (H5T_VLEN==dst->type);
@@ -2151,8 +2151,8 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             /*
              * Conversion.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /*
@@ -2209,7 +2209,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
             /* Get initial conversion buffer */
             conv_buf_size=MAX(src_base_size,dst_base_size);
-            if ((conv_buf=H5FL_BLK_ALLOC(vlen_seq,conv_buf_size,1))==NULL)
+            if ((conv_buf=H5FL_BLK_CALLOC(vlen_seq,conv_buf_size))==NULL)
                 HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion");
 
             /* Set up conversion path for base elements */
@@ -2225,7 +2225,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             if(tpath->cdata.need_bkg||H5T_detect_class(dst->parent,H5T_VLEN)) {
                 /* Set up initial background buffer */
                 tmp_buf_size=MAX(src_base_size,dst_base_size);
-                if ((tmp_buf=H5FL_BLK_ALLOC(vlen_seq,tmp_buf_size,1))==NULL)
+                if ((tmp_buf=H5FL_BLK_CALLOC(vlen_seq,tmp_buf_size))==NULL)
                     HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion");
             } /* end if */
     
@@ -2340,13 +2340,6 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
                 } /* end if */
             }
 
-            /* Release the conversion buffer (always allocated) */
-            H5FL_BLK_FREE(vlen_seq,conv_buf);
-
-            /* Release the background buffer, if we have one */
-            if(tmp_buf!=NULL)
-                H5FL_BLK_FREE(vlen_seq,tmp_buf);
-
             /* Release the temporary datatype IDs used */
             if (tsrc_id >= 0)
                 H5I_dec_ref(tsrc_id);
@@ -2359,6 +2352,13 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
     }   /* end switch */
     
 done:
+    /* Release the conversion buffer (always allocated, except on errors) */
+    if(conv_buf!=NULL)
+        H5FL_BLK_FREE(vlen_seq,conv_buf);
+    /* Release the background buffer, if we have one */
+    if(tmp_buf!=NULL)
+        H5FL_BLK_FREE(vlen_seq,tmp_buf);
+
     FUNC_LEAVE (ret_value);
 }
 
@@ -2407,8 +2407,8 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
              * information that remains (almost) constant for this
              * conversion path.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             assert (H5T_ARRAY==src->type);
             assert (H5T_ARRAY==dst->type);
@@ -2438,8 +2438,8 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             /*
              * Conversion.
              */
-            if (NULL == (src = H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL == (dst = H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL == (src = H5I_object(src_id)) ||
+                    NULL == (dst = H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /*
@@ -2477,7 +2477,7 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
             if(tpath->cdata.need_bkg) {
                 /* Allocate background buffer */
                 bkg_buf_size=src->u.array.nelem*MAX(src->size,dst->size);
-                if ((bkg_buf=H5FL_BLK_ALLOC(array_seq,bkg_buf_size,0))==NULL)
+                if ((bkg_buf=H5FL_BLK_MALLOC(array_seq,bkg_buf_size))==NULL)
                     HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion");
             } /* end if */
 
@@ -2560,8 +2560,8 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
     switch (cdata->command) {
         case H5T_CONV_INIT:
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==(dst=H5I_object(dst_id)))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             if (H5T_ORDER_LE!=src->u.atomic.order &&
                     H5T_ORDER_BE!=src->u.atomic.order)
@@ -2579,8 +2579,8 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the data types */
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==(dst=H5I_object(dst_id)))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /*
@@ -2899,8 +2899,8 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
     switch (cdata->command) {
         case H5T_CONV_INIT:
-            if (NULL==(src_p=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst_p=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src_p=H5I_object(src_id)) ||
+                    NULL==(dst_p=H5I_object(dst_id)))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             src = src_p->u.atomic;
             dst = dst_p->u.atomic;
@@ -2920,8 +2920,8 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the data types */
-            if (NULL==(src_p=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst_p=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src_p=H5I_object(src_id)) ||
+                    NULL==(dst_p=H5I_object(dst_id)))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             src = src_p->u.atomic;
             dst = dst_p->u.atomic;
@@ -3308,8 +3308,8 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
     switch (cdata->command) {
         case H5T_CONV_INIT:
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==(dst=H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             if (8*src->size != src->u.atomic.prec || 8*dst->size != dst->u.atomic.prec)
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad precision");
@@ -3328,8 +3328,8 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
 
         case H5T_CONV_CONV:
             /* Get the data types */
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==(dst=H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 
             /*
@@ -6473,8 +6473,8 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
     switch (cdata->command) {
         case H5T_CONV_INIT:
             cdata->need_bkg = H5T_BKG_NO;
-            if (NULL==(st=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dt=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(st=H5I_object(src_id)) ||
+                    NULL==(dt=H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to dereference data type object ID");
             if (st->size!=sizeof(float) || dt->size!=sizeof(double))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "disagreement about data type size");
@@ -6593,8 +6593,8 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
     switch (cdata->command) {
         case H5T_CONV_INIT:
             cdata->need_bkg = H5T_BKG_NO;
-            if (NULL==(st=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==(dt=H5I_object_verify(dst_id,H5I_DATATYPE)))
+            if (NULL==(st=H5I_object(src_id)) ||
+                    NULL==(dt=H5I_object(dst_id)))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to dereference data type object ID");
             if (st->size!=sizeof(double) || dt->size!=sizeof(float))
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "disagreement about data type size");
@@ -6731,8 +6731,8 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
         case H5T_CONV_CONV:
             /* The conversion */
-            if (NULL==(src=H5I_object_verify(src_id,H5I_DATATYPE)) ||
-                    NULL==H5I_object_verify(dst_id,H5I_DATATYPE))
+            if (NULL==(src=H5I_object(src_id)) ||
+                    NULL==H5I_object(dst_id))
                 HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
             
             s = (uint8_t*)buf + (buf_stride?buf_stride:4)*(nelmts-1);