[svn-r7367] Purpose:

    Update

Description:
    Added an extra flag to the clear functions that triggers a "destroy"
    of the object being cleared if necessary. This is a fix for the
    FPHDF5 stuff which had an object sticking around after it was
    cleared. (In FPHDF5, some processes are in charge of destroying the
    object, but all processes might actually allocate the object.)

Platforms tested:
    AIX (Copper: Fortran & C++)
    Linux (Verbena: Fortran & C++)
    IRIX (Modi4: Parallel & Fortran)
    (Sol is down)

Misc. update:

1 files changed, 10 insertions, 3 deletions

diff --git a/src/H5HL.c b/src/H5HL.c
index 550d5f6..3d72889 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -68,7 +68,7 @@ static H5HL_t *H5HL_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udat
 			 void *udata2);
 static herr_t H5HL_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, H5HL_t *heap);
 static herr_t H5HL_dest(H5F_t *f, H5HL_t *heap);
-static herr_t H5HL_clear(H5HL_t *heap);
+static herr_t H5HL_clear(H5HL_t *heap, hbool_t destroy);
 
 /*
  * H5HL inherits cache-like properties from H5AC
@@ -568,8 +568,10 @@ H5HL_dest(H5F_t UNUSED *f, H5HL_t *heap)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HL_clear(H5HL_t *heap)
+H5HL_clear(H5HL_t *heap, hbool_t destroy)
 {
+    herr_t ret_value = SUCCEED;
+
     FUNC_ENTER_NOINIT(H5HL_clear);
 
     /* check arguments */
@@ -578,7 +580,12 @@ H5HL_clear(H5HL_t *heap)
     /* Mark heap as clean */
     heap->cache_info.dirty = 0;
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
+    if (destroy)
+        if (H5HL_dest(NULL, heap) < 0)
+	    HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy local heap collection");
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5HL_clear() */