[svn-r13926] Description:

    Add small interface to "wrap" a static buffer (usually on the stack), but
still allow for buffers larger than the static buffer to be allocated.  This
can eliminate _many_ short-lived buffer allocations in situations where the
buffer is a predictable size (or at least a "very likely" size).

    Also, some minor code cleanups, particularly in the SOHM caching code.

Tested on:
    Mac OS X/32 10.4.10 (amazon)

1 files changed, 25 insertions, 25 deletions

diff --git a/src/H5Adense.c b/src/H5Adense.c
index 892a334..e35366a 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -42,6 +42,7 @@
 #include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Opkg.h"		/* Object headers			*/
 #include "H5SMprivate.h"	/* Shared object header messages        */
+#include "H5WBprivate.h"        /* Wrapped Buffers                      */
 
 
 /****************/
@@ -166,9 +167,6 @@ typedef struct H5A_bt2_ud_rmbi_t {
 /* Local Variables */
 /*******************/
 
-/* Declare a free list to manage the serialized attribute information */
-H5FL_BLK_DEFINE(ser_attr);
-
 
 
 /*-------------------------------------------------------------------------
@@ -410,8 +408,8 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
     H5A_bt2_ud_ins_t udata;             /* User data for v2 B-tree insertion */
     H5HF_t *fheap = NULL;               /* Fractal heap handle for attributes */
     H5HF_t *shared_fheap = NULL;        /* Fractal heap handle for shared header messages */
+    H5WB_t *wb = NULL;                  /* Wrapped buffer for attribute data */
     uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing message */
-    void *attr_ptr = NULL;              /* Pointer to serialized message */
     unsigned mesg_flags = 0;            /* Flags for storing message */
     htri_t attr_sharable;               /* Flag indicating attributes are sharable */
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -474,19 +472,20 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
         udata.id = attr->sh_loc.u.heap_id;
     } /* end if */
     else {
-        size_t attr_size;                   /* Size of serialized attribute in the heap */
+        void *attr_ptr;         /* Pointer to serialized message */
+        size_t attr_size;       /* Size of serialized attribute in the heap */
 
         /* Find out the size of buffer needed for serialized message */
         if((attr_size = H5O_msg_raw_size(f, H5O_ATTR_ID, FALSE, attr)) == 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get message size")
 
-        /* Allocate space for serialized message, if necessary */
-        if(attr_size > sizeof(attr_buf)) {
-            if(NULL == (attr_ptr = H5FL_BLK_MALLOC(ser_attr, attr_size)))
-                HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "memory allocation failed")
-        } /* end if */
-        else
-            attr_ptr = attr_buf;
+        /* Wrap the local buffer for serialized attributes */
+        if(NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't wrap buffer")
+
+        /* Get a pointer to a buffer that's large enough for attribute */
+        if(NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
+            HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Create serialized form of attribute or shared message */
         if(H5O_msg_encode(f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, attr) < 0)
@@ -529,8 +528,8 @@ done:
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
     if(fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(attr_ptr && attr_ptr != attr_buf)
-        (void)H5FL_BLK_FREE(ser_attr, attr_ptr);
+    if(wb && H5WB_unwrap(wb) < 0)
+        HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_insert() */
@@ -592,8 +591,8 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
 {
     H5A_dense_bt2_name_rec_t *record = (H5A_dense_bt2_name_rec_t *)_record; /* Record from B-tree */
     H5A_bt2_od_wrt_t *op_data = (H5A_bt2_od_wrt_t *)_op_data;       /* "op data" from v2 B-tree modify */
+    H5WB_t *wb = NULL;                  /* Wrapped buffer for attribute data */
     uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */
-    void *attr_ptr = NULL;              /* Pointer to serialized attribute */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5A_dense_write_bt2_cb)
@@ -638,19 +637,20 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
         *changed = TRUE;
     } /* end if */
     else {
-        size_t attr_size;               /* Size of serialized attribute in the heap */
+        void *attr_ptr;         /* Pointer to serialized message */
+        size_t attr_size;       /* Size of serialized attribute in the heap */
 
         /* Find out the size of buffer needed for serialized attribute */
         if((attr_size = H5O_msg_raw_size(op_data->f, H5O_ATTR_ID, FALSE, op_data->attr)) == 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTGETSIZE, FAIL, "can't get attribute size")
 
-        /* Allocate space for serialized attribute, if necessary */
-        if(attr_size > sizeof(attr_buf)) {
-            if(NULL == (attr_ptr = H5FL_BLK_MALLOC(ser_attr, attr_size)))
-                HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "memory allocation failed")
-        } /* end if */
-        else
-            attr_ptr = attr_buf;
+        /* Wrap the local buffer for serialized attributes */
+        if(NULL == (wb = H5WB_wrap(attr_buf, sizeof(attr_buf))))
+            HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "can't wrap buffer")
+
+        /* Get a pointer to a buffer that's large enough for attribute */
+        if(NULL == (attr_ptr = H5WB_actual(wb, attr_size)))
+            HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, FAIL, "can't get actual buffer")
 
         /* Create serialized form of attribute */
         if(H5O_msg_encode(op_data->f, H5O_ATTR_ID, FALSE, (unsigned char *)attr_ptr, op_data->attr) < 0)
@@ -674,8 +674,8 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
 
 done:
     /* Release resources */
-    if(attr_ptr && attr_ptr != attr_buf)
-        (void)H5FL_BLK_FREE(ser_attr, attr_ptr);
+    if(wb && H5WB_unwrap(wb) < 0)
+        HDONE_ERROR(H5E_ATTR, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5A_dense_write_bt2_cb() */