[svn-r8667] Purpose:

    Code optimization

Description:
    Restructure conversion loop of variable-length objects to avoid walking
through memory backwards and allocating as many temporary buffers.  (This uses
the optimized method used in the atomic type conversions).
    Also bring back another optimization for variable-length datatypes that
avoids querying the DXPL so many times.

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

1 files changed, 14 insertions, 1 deletions

diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index 9d40e85..b28c01f 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -18,8 +18,12 @@
 #ifndef _H5Tprivate_H
 #define _H5Tprivate_H
 
+/* Get package's public header */
 #include "H5Tpublic.h"
 
+/* Other public headers needed by this file */
+#include "H5MMpublic.h"         /* Memory management                    */
+
 /* Private headers needed by this file */
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Gprivate.h"		/* Groups 			  	*/
@@ -30,7 +34,7 @@ typedef struct H5T_t H5T_t;
 typedef struct H5T_stats_t H5T_stats_t;
 typedef struct H5T_path_t H5T_path_t;
 
-/* How to copy a data type */
+/* How to copy a datatype */
 typedef enum H5T_copy_t {
     H5T_COPY_TRANSIENT,
     H5T_COPY_ALL,
@@ -45,6 +49,14 @@ typedef enum {
     H5T_VLEN_MAXLOC         /* highest type (Invalid as true type) */
 } H5T_vlen_loc_t;
 
+/* VL allocation information */
+typedef struct {
+    H5MM_allocate_t alloc_func; /* Allocation function */
+    void *alloc_info;           /* Allocation information */
+    H5MM_free_t free_func;      /* Free function */
+    void *free_info;            /* Free information */
+} H5T_vlen_alloc_info_t;
+
 /* Private functions */
 H5_DLL herr_t H5TN_init_interface(void);
 H5_DLL herr_t H5T_init(void);
@@ -69,6 +81,7 @@ H5_DLL herr_t H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id,
 			   hsize_t nelmts, size_t buf_stride, size_t bkg_stride,
                            void *buf, void *bkg, hid_t dset_xfer_plist);
 H5_DLL herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t ndim, hssize_t *point, void *_op_data);
+H5_DLL herr_t H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t *vl_alloc_info);
 H5_DLL htri_t H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc);
 H5_DLL htri_t H5T_is_sensible(const H5T_t *dt);
 H5_DLL htri_t H5T_committed(H5T_t *type);