Cleaned up feature for dissemination to LLNL:

    - Removed support for datatypes.
    - Commented out support for groups
    - General change clean-up
    - Added a list of improvements to BRANCH.txt

1 files changed, 11 insertions, 7 deletions

diff --git a/src/H5Gint.c b/src/H5Gint.c
index ff92ecc..4b34015 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -501,20 +501,24 @@ H5G_close(H5G_t *grp)
         if(H5O_close(&(grp->oloc)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
 
+#ifdef DER
+        /* XXX - NOT IMPLEMENTED */
         /* Evict group metadata if evicting on close */
         if(H5F_SHARED(grp->oloc.file) && H5F_EVICT_ON_CLOSE(grp->oloc.file)) {
-//            printf("EVICTING GROUP (TAG: 0x%3llx)\n", grp->oloc.addr);
-//            printf("DUMPING CACHE - BEFORE FLUSH\n");
-//            H5AC_dump_cache(grp->oloc.file);
+            /* I've left in the cache dump code for now - DER */
+            printf("EVICTING GROUP (TAG: 0x%3llx)\n", grp->oloc.addr);
+            printf("DUMPING CACHE - BEFORE FLUSH\n");
+            H5AC_dump_cache(grp->oloc.file);
             if(H5AC_flush_tagged_metadata(grp->oloc.file, grp->oloc.addr, H5AC_ind_read_dxpl_id) < 0) 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
-//            printf("DUMPING CACHE - BETWEEN FLUSH AND EVICT\n");
-//            H5AC_dump_cache(grp->oloc.file);
+            printf("DUMPING CACHE - BETWEEN FLUSH AND EVICT\n");
+            H5AC_dump_cache(grp->oloc.file);
             if(H5AC_evict_tagged_metadata(grp->oloc.file, grp->oloc.addr, FALSE, H5AC_ind_read_dxpl_id) < 0) 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to evict tagged metadata")
-//            printf("DUMPING CACHE - AFTER EVICT\n");
-//            H5AC_dump_cache(grp->oloc.file);
+            printf("DUMPING CACHE - AFTER EVICT\n");
+            H5AC_dump_cache(grp->oloc.file);
         } /* end if */
+#endif /* DER */
 
         /* Free memory */
         grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);