[svn-r28916] Description:

    Normalize against incoming changes from the phdf5_metadata_opt branch.

Tested on:
    MacOSX/64 10.11.2 (amazon) w/serial & parallel
    (h5committest forthcoming)

1 files changed, 74 insertions, 1 deletions

diff --git a/src/H5Pint.c b/src/H5Pint.c
index 443802c..d80e66d 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -139,6 +139,8 @@ hid_t H5P_CLS_DATATYPE_ACCESS_ID_g              = FAIL;
 H5P_genclass_t *H5P_CLS_DATATYPE_ACCESS_g       = NULL;
 hid_t H5P_CLS_ATTRIBUTE_CREATE_ID_g             = FAIL;
 H5P_genclass_t *H5P_CLS_ATTRIBUTE_CREATE_g      = NULL;
+hid_t H5P_CLS_ATTRIBUTE_ACCESS_ID_g             = FAIL;
+H5P_genclass_t *H5P_CLS_ATTRIBUTE_ACCESS_g      = NULL;
 hid_t H5P_CLS_OBJECT_COPY_ID_g                  = FAIL;
 H5P_genclass_t *H5P_CLS_OBJECT_COPY_g           = NULL;
 hid_t H5P_CLS_LINK_CREATE_ID_g                  = FAIL;
@@ -163,6 +165,7 @@ hid_t H5P_LST_GROUP_ACCESS_ID_g         = FAIL;
 hid_t H5P_LST_DATATYPE_CREATE_ID_g      = FAIL;
 hid_t H5P_LST_DATATYPE_ACCESS_ID_g      = FAIL;
 hid_t H5P_LST_ATTRIBUTE_CREATE_ID_g     = FAIL;
+hid_t H5P_LST_ATTRIBUTE_ACCESS_ID_g     = FAIL;
 hid_t H5P_LST_OBJECT_COPY_ID_g          = FAIL;
 hid_t H5P_LST_LINK_CREATE_ID_g          = FAIL;
 hid_t H5P_LST_LINK_ACCESS_ID_g          = FAIL;
@@ -186,6 +189,26 @@ const H5P_libclass_t H5P_CLS_ROOT[1] = {{
     NULL 		        /* Class close callback info    */
 }};
 
+/* Attribute access property list class library initialization object */
+/* (move to proper source code file when used for real) */
+const H5P_libclass_t H5P_CLS_AACC[1] = {{
+    "attribute access",		/* Class name for debugging     */
+    H5P_TYPE_ATTRIBUTE_ACCESS,  /* Class type                   */
+
+    &H5P_CLS_LINK_ACCESS_g,	/* Parent class                 */
+    &H5P_CLS_ATTRIBUTE_ACCESS_g,	/* Pointer to class             */
+    &H5P_CLS_ATTRIBUTE_ACCESS_ID_g,	/* Pointer to class ID          */
+    &H5P_LST_ATTRIBUTE_ACCESS_ID_g,	/* Pointer to default property list ID */
+    NULL,			/* Default property registration routine */
+
+    NULL,		        /* Class creation callback      */
+    NULL,		        /* Class creation callback info */
+    NULL,			/* Class copy callback          */
+    NULL,		        /* Class copy callback info     */
+    NULL,			/* Class close callback         */
+    NULL 		        /* Class close callback info    */
+}};
+
 /* Group access property list class library initialization object */
 /* (move to proper source code file when used for real) */
 const H5P_libclass_t H5P_CLS_GACC[1] = {{
@@ -297,6 +320,7 @@ static H5P_libclass_t const * const init_class[] = {
     H5P_CLS_TCRT,       /* Datatype creation */
     H5P_CLS_TACC,       /* Datatype access */
     H5P_CLS_ACRT,       /* Attribute creation */
+    H5P_CLS_AACC,       /* Attribute access */
     H5P_CLS_LCRT        /* Link creation */
 };
 
@@ -487,6 +511,7 @@ H5P_term_package(void)
                         H5P_LST_DATATYPE_CREATE_ID_g =
                         H5P_LST_DATATYPE_ACCESS_ID_g =
                         H5P_LST_ATTRIBUTE_CREATE_ID_g =
+                        H5P_LST_ATTRIBUTE_ACCESS_ID_g =
                         H5P_LST_OBJECT_COPY_ID_g =
                         H5P_LST_LINK_CREATE_ID_g =
                         H5P_LST_LINK_ACCESS_ID_g =
@@ -513,6 +538,7 @@ H5P_term_package(void)
                         H5P_CLS_DATATYPE_ACCESS_g =
                         H5P_CLS_STRING_CREATE_g =
                         H5P_CLS_ATTRIBUTE_CREATE_g =
+                        H5P_CLS_ATTRIBUTE_ACCESS_g =
                         H5P_CLS_OBJECT_COPY_g =
                         H5P_CLS_LINK_CREATE_g =
                         H5P_CLS_LINK_ACCESS_g =
@@ -531,6 +557,7 @@ H5P_term_package(void)
                         H5P_CLS_DATATYPE_ACCESS_ID_g =
                         H5P_CLS_STRING_CREATE_ID_g =
                         H5P_CLS_ATTRIBUTE_CREATE_ID_g =
+                        H5P_CLS_ATTRIBUTE_ACCESS_ID_g =
                         H5P_CLS_OBJECT_COPY_ID_g =
                         H5P_CLS_LINK_CREATE_ID_g =
                         H5P_CLS_LINK_ACCESS_ID_g =
@@ -5253,7 +5280,7 @@ H5P__new_plist_of_type(H5P_plist_type_t type)
     FUNC_ENTER_PACKAGE
 
     /* Sanity checks */
-    HDcompile_assert(H5P_TYPE_LINK_ACCESS == (H5P_TYPE_MAX_TYPE - 1));
+    HDcompile_assert(H5P_TYPE_ATTRIBUTE_ACCESS == (H5P_TYPE_MAX_TYPE - 1));
     HDassert(type >= H5P_TYPE_USER && type <= H5P_TYPE_LINK_ACCESS);
 
     /* Check arguments */
@@ -5316,6 +5343,10 @@ H5P__new_plist_of_type(H5P_plist_type_t type)
             class_id = H5P_CLS_ATTRIBUTE_CREATE_ID_g;
             break;
 
+        case H5P_TYPE_ATTRIBUTE_ACCESS:
+            class_id = H5P_CLS_ATTRIBUTE_ACCESS_ID_g;
+            break;
+
         case H5P_TYPE_OBJECT_COPY:
             class_id = H5P_CLS_OBJECT_COPY_ID_g;
             break;
@@ -5403,3 +5434,45 @@ H5P_get_class(const H5P_genplist_t *plist)
     FUNC_LEAVE_NOAPI(plist->pclass)
 } /* end H5P_get_class() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5P_verify_apl_and_dxpl
+ *
+ * Purpose:	Validate access property list and/or switch from generic
+ *		property list to default of correct type.
+ *
+ *		Also, if using internal DXPL and collective flag is set,
+ *		switch to internal collective DXPL.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Mohamad Chaarawi
+ *              Sunday, June 21, 2015
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t 
+H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *dxpl_id)
+{
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT
+
+    /* Sanity check */
+    HDassert(acspl_id);
+    HDassert(libclass);
+    HDassert(dxpl_id);
+
+    /* Set access plist to the default property list of the appropriate class if it's the generic default */
+    if(H5P_DEFAULT == *acspl_id)
+        *acspl_id = *libclass->def_plist_id;
+    else {
+        /* Sanity check the access property list class */
+        if(TRUE != H5P_isa_class(*acspl_id, *libclass->class_id))
+            HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not the required access property list")
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5P_verify_apl_and_dxpl() */
+