[svn-r27835] Description:

    Sync w/trunk.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel
    (h5committest not required on this branch)

1 files changed, 22 insertions, 33 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 525f78b..6cf77c2 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -31,11 +31,9 @@
 /* Module Setup */
 /****************/
 
-#define H5AC_PACKAGE            /*suppress error about including H5ACpkg  */
-#define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
+#include "H5ACmodule.h"         /* This source code file is part of the H5AC module */
+#define H5F_FRIEND		/*suppress error about including H5Fpkg	  */
 
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5AC_init_interface
 
 /***********/
 /* Headers */
@@ -74,6 +72,9 @@ static herr_t H5AC__ext_config_2_int_config(H5AC_cache_config_t *ext_conf_ptr,
 /* Package Variables */
 /*********************/
 
+/* Package initialization variable */
+hbool_t H5_PKG_INIT_VAR = FALSE;
+
 
 /*****************************/
 /* Library Private Variables */
@@ -135,7 +136,6 @@ static const char *H5AC_entry_type_names[H5AC_NTYPES] =
  * Purpose:	Initialize the interface from some other layer.
  *
  * Return:	Success:	non-negative
- *
  *		Failure:	negative
  *
  * Programmer:	Quincey Koziol
@@ -146,7 +146,7 @@ static const char *H5AC_entry_type_names[H5AC_NTYPES] =
 herr_t
 H5AC_init(void)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
     /* FUNC_ENTER() does all the work */
@@ -157,7 +157,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5AC_init_interface
+ * Function:	H5AC__init_package
  *
  * Purpose:	Initialize interface-specific information
  *
@@ -168,8 +168,8 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t
-H5AC_init_interface(void)
+herr_t
+H5AC__init_package(void)
 {
 #ifdef H5_HAVE_PARALLEL
     H5P_genplist_t  *xfer_plist;    /* Dataset transfer property list object */
@@ -177,7 +177,7 @@ H5AC_init_interface(void)
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value = SUCCEED;     /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_PACKAGE
 
 #ifdef H5_HAVE_PARALLEL
     /* Sanity check */
@@ -224,17 +224,16 @@ H5AC_init_interface(void)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5AC_init_interface() */
+} /* end H5AC__init_package() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5AC_term_interface
+ * Function:	H5AC_term_package
  *
  * Purpose:	Terminate this interface.
  *
  * Return:	Success:	Positive if anything was done that might
  *				affect other interfaces; zero otherwise.
- *
  * 		Failure:	Negative.
  *
  * Programmer:	Quincey Koziol
@@ -243,13 +242,13 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5AC_term_interface(void)
+H5AC_term_package(void)
 {
     int	n = 0;
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
-    if(H5_interface_initialize_g) {
+    if(H5_PKG_INIT_VAR) {
 #ifdef H5_HAVE_PARALLEL
         if(H5AC_dxpl_id > 0 || H5AC_ind_dxpl_id > 0) {
             /* Indicate more work to do */
@@ -258,30 +257,20 @@ H5AC_term_interface(void)
             /* Close H5AC dxpl */
             if(H5I_dec_ref(H5AC_dxpl_id) < 0 || H5I_dec_ref(H5AC_ind_dxpl_id) < 0)
                 H5E_clear_stack(NULL); /*ignore error*/
-            else {
-                /* Reset static IDs */
-                H5AC_dxpl_id = (-1);
-                H5AC_ind_dxpl_id = (-1);
-
-                /* Reset interface initialization flag */
-                H5_interface_initialize_g = 0;
-            } /* end else */
         } /* end if */
-        else {
-#endif /* H5_HAVE_PARALLEL */
-            /* Reset static IDs */
-            H5AC_dxpl_id = (-1);
-            H5AC_ind_dxpl_id = (-1);
-#ifdef H5_HAVE_PARALLEL
-        } /* end else */
 #endif /* H5_HAVE_PARALLEL */
+            
+        /* Reset static IDs */
+        H5AC_dxpl_id = (-1);
+        H5AC_ind_dxpl_id = (-1);
 
         /* Reset interface initialization flag */
-        H5_interface_initialize_g = 0;
+        if(0 == n)
+            H5_PKG_INIT_VAR = FALSE;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)
-} /* end H5AC_term_interface() */
+} /* end H5AC_term_package() */
 
 
 /*-------------------------------------------------------------------------
@@ -1066,7 +1055,7 @@ H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
     size_t		trace_entry_size = 0;
     FILE *              trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
-    void *		ret_value;      /* Return value */
+    void *		ret_value = NULL;       /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)