[svn-r13745] Description:

    Take further advantage of the readers/writer locking in the metadata cache
and push the locking of the local heap up to the routines which call B-tree
routines, which should drastically lower the number of metadata cache protect/
unprotect calls.

Tested on:
    Mac OS X/32 10.4.9 (amazon)
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)

1 files changed, 25 insertions, 15 deletions

diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 9c03b20..cf34ead 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -128,7 +128,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
 
     HDassert(s && !*s);
 
-    if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr, H5AC__NO_FLAGS_SET) < 0)
+    if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
     heap = NULL;
 #endif
@@ -157,7 +157,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
 	HDassert(mesg->slot[u].size > 0);
     } /* end for */
 
-    if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr, H5AC__NO_FLAGS_SET) < 0)
+    if(H5HL_unprotect(f, dxpl_id, heap, mesg->heap_addr) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read unprotect link value")
     heap = NULL;
 
@@ -419,10 +419,11 @@ static void *
 H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
     hid_t dxpl_id, H5O_copy_t UNUSED *cpy_info, void UNUSED *_udata)
 {
-    H5O_efl_t     *efl_src = (H5O_efl_t *) mesg_src;
-    H5O_efl_t     *efl_dst = NULL;
-    size_t        idx, size, name_offset, heap_size;
-    void          *ret_value;          /* Return value */
+    H5O_efl_t   *efl_src = (H5O_efl_t *) mesg_src;
+    H5O_efl_t   *efl_dst = NULL;
+    H5HL_t      *heap = NULL;                           /* Pointer to local heap for EFL file names */
+    size_t      idx, size, name_offset, heap_size;
+    void        *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5O_efl_copy_file)
 
@@ -432,22 +433,27 @@ H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
 
     /* Allocate space for the destination efl */
     if(NULL == (efl_dst = H5MM_calloc(sizeof(H5O_efl_t))))
-        HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     /* Copy the "top level" information */
     HDmemcpy(efl_dst, efl_src, sizeof(H5O_efl_t));
 
-    /* create name heap */
-    heap_size = H5HL_ALIGN(1);
+    /* Determine size needed for destination heap */
+    heap_size = H5HL_ALIGN(1);  /* "empty" name */
     for(idx = 0; idx < efl_src->nused; idx++)
         heap_size += H5HL_ALIGN(HDstrlen(efl_src->slot[idx].name) + 1);
 
+    /* Create name heap */
     if(H5HL_create(file_dst, dxpl_id, heap_size, &efl_dst->heap_addr/*out*/) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't create heap")
+        HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, NULL, "can't create heap")
 
-    name_offset = H5HL_insert(file_dst, dxpl_id, efl_dst->heap_addr, (size_t)1, "");
-    if((size_t)(-1) == name_offset)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't initialize heap")
+    /* Pin the heap down in memory */
+    if(NULL == (heap = H5HL_protect(file_dst, dxpl_id, efl_dst->heap_addr, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to protect EFL file name heap")
+
+    /* Insert "empty" name first */
+    if((size_t)(-1) == (name_offset = H5HL_insert(file_dst, dxpl_id, heap, (size_t)1, "")))
+        HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap")
     HDassert(0 == name_offset);
 
     /* allocate array of external file entries */
@@ -463,14 +469,18 @@ H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
     /* copy the name from the source */
     for(idx = 0; idx < efl_src->nused; idx++) {
         efl_dst->slot[idx].name = H5MM_xstrdup(efl_src->slot[idx].name);
-        efl_dst->slot[idx].name_offset = H5HL_insert(file_dst, dxpl_id, efl_dst->heap_addr,
-            HDstrlen(efl_dst->slot[idx].name) + 1, efl_dst->slot[idx].name);
+        if((size_t)(-1) == (efl_dst->slot[idx].name_offset = H5HL_insert(file_dst, dxpl_id, heap,
+                HDstrlen(efl_dst->slot[idx].name) + 1, efl_dst->slot[idx].name)))
+            HGOTO_ERROR(H5E_EFL, H5E_CANTINSERT, NULL, "can't insert file name into heap")
     } /* end for */
 
     /* Set return value */
     ret_value = efl_dst;
 
 done:
+    /* Release resources */
+    if(heap && H5HL_unprotect(file_dst, dxpl_id, heap, efl_dst->heap_addr) < 0)
+        HDONE_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to unprotect EFL file name heap")
     if(!ret_value)
         if(efl_dst)
             H5MM_xfree(efl_dst);