[svn-r29850] Description:

    Bring H5DOappend(), H5P[s|g]et_object_flush_cb, and H5P[s|g]et_append_flush
from revise_chunks branch to trunk.  Brings along updated metadata cache
entry tagging, and the internal object flush routine.

Tested on:
    MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
    (h5committest forthcoming)

1 files changed, 130 insertions, 1 deletions

diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c
index 6407d4c..aa58dc4 100644
--- a/src/H5Pdapl.c
+++ b/src/H5Pdapl.c
@@ -73,6 +73,9 @@
 #define H5D_ACS_VDS_PRINTF_GAP_DEF              (hsize_t)0
 #define H5D_ACS_VDS_PRINTF_GAP_ENC              H5P__encode_hsize_t
 #define H5D_ACS_VDS_PRINTF_GAP_DEC              H5P__decode_hsize_t
+/* Definition for append flush */
+#define H5D_ACS_APPEND_FLUSH_SIZE            	sizeof(H5D_append_flush_t)
+#define H5D_ACS_APPEND_FLUSH_DEF             	{0,{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},NULL,NULL}
 /* Definitions for external file prefix */
 #define H5D_ACS_EFILE_PREFIX_SIZE               sizeof(char *)
 #define H5D_ACS_EFILE_PREFIX_DEF                NULL /*default is no prefix */
@@ -157,9 +160,9 @@ const H5P_libclass_t H5P_CLS_DACC[1] = {{
 /*******************/
 
 /* Property value defaults */
+static const H5D_append_flush_t H5D_def_append_flush_g = H5D_ACS_APPEND_FLUSH_DEF;       /* Default setting for append flush */
 static const char *H5D_def_efile_prefix_g = H5D_ACS_EFILE_PREFIX_DEF; /* Default external file prefix string */
 
-
 
 /*-------------------------------------------------------------------------
  * Function:    H5P__dacc_reg_prop
@@ -212,6 +215,12 @@ H5P__dacc_reg_prop(H5P_genclass_t *pclass)
             NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
+    /* Register info for append flush */
+    /* (Note: this property should not have an encode/decode callback -QAK) */
+    if(H5P_register_real(pclass, H5D_ACS_APPEND_FLUSH_NAME, H5D_ACS_APPEND_FLUSH_SIZE, &H5D_def_append_flush_g, 
+             NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
+         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+
     /* Register property for external file prefix */
     if(H5P_register_real(pclass, H5D_ACS_EFILE_PREFIX_NAME, H5D_ACS_EFILE_PREFIX_SIZE, &H5D_def_efile_prefix_g, 
             NULL, H5D_ACS_EFILE_PREFIX_SET, H5D_ACS_EFILE_PREFIX_GET, H5D_ACS_EFILE_PREFIX_ENC, H5D_ACS_EFILE_PREFIX_DEC,
@@ -1076,6 +1085,125 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5Pset_append_flush
+ *
+ * Purpose:	Sets the boundary, callback function, and user data in the
+ *		property list.
+ *		"ndims": number of array elements for boundary
+ *		"boundary": used to determine whether the current dimension hits 
+ *			  a boundary; if so, invoke the callback function and
+ *			  flush the dataset.
+ *		"func": the callback function to invoke when the boundary is hit
+ *		"udata": the user data to pass as parameter with the callback function
+ *	
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Vailin Choi; Dec 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D_append_cb_t func, void *udata)
+{
+    H5P_genplist_t *plist;      	/* Property list pointer */
+    H5D_append_flush_t info;            /* Property for append flush parameters */
+    unsigned u;				/* Local index variable */
+    herr_t ret_value = SUCCEED;   	/* Return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE5("e", "iIu*hx*x", plist_id, ndims, boundary, func, udata);
+
+    /* Check arguments */
+    if(0 == ndims)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimensionality cannot be zero")
+    if(ndims > H5S_MAX_RANK)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimensionality is too large")
+    if(!boundary)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no boundary dimensions specified")
+
+    /* Check if the callback function is NULL and the user data is non-NULL.
+     * This is almost certainly an error as the user data will not be used. */
+    if(!func && udata)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "callback is NULL while user data is not")
+ 
+    /* Get the plist structure */
+    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
+
+    /* Set up values */
+    info.ndims = ndims;
+    info.func = func;
+    info.udata = udata;
+
+    HDmemset(info.boundary, 0, sizeof(info.boundary));
+    /* boundary can be 0 to indicate no boundary is set */
+    for(u = 0; u < ndims; u++) {
+        if(boundary[u] != (boundary[u] & 0xffffffff)) /* negative value (including H5S_UNLIMITED) */
+            HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "all boundary dimensions must be less than 2^32")
+        info.boundary[u] = boundary[u]; /* Store user's boundary dimensions */
+    } /* end for */
+
+    /* Set values */
+    if(H5P_set(plist, H5D_ACS_APPEND_FLUSH_NAME, &info) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set append flush")
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* H5Pset_append_flush() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5Pget_append_flush()
+ *
+ * Purpose:	Retrieves the boundary, callback function and user data set in 
+ *		property list.
+ *		Note that the # of boundary sizes to retrieve will not exceed
+ *		the parameter "ndims" and the ndims set previously via 
+ *		H5Pset_append_flush().
+ *	
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Vailin Choi; Dec 2013
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5Pget_append_flush(hid_t plist_id, unsigned ndims, hsize_t boundary[], H5D_append_cb_t *func, void **udata)
+{
+    H5P_genplist_t *plist;      /* property list pointer */
+    H5D_append_flush_t  info;
+    unsigned u;			/* local index variable */
+    herr_t ret_value = SUCCEED; /* return value */
+
+    FUNC_ENTER_API(FAIL)
+    H5TRACE5("e", "iIu*h*x**x", plist_id, ndims, boundary, func, udata);
+
+    /* Get the plist structure */
+    if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS)))
+        HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
+
+    /* Retrieve info for append flush */
+    if(H5P_get(plist, H5D_ACS_APPEND_FLUSH_NAME, &info) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object flush callback")
+
+    /* Assign return values */
+    if(boundary) {
+	HDmemset(boundary, 0, ndims * sizeof(hsize_t));
+	if(info.ndims > 0)
+	    for(u = 0; u < info.ndims && u < ndims; u++)
+		boundary[u] = info.boundary[u];
+    } /* end if */
+    if(func)
+	*func = info.func;
+    if(udata)
+	*udata = info.udata;
+
+done:
+    FUNC_LEAVE_API(ret_value)
+} /* H5Pget_append_flush() */
+
+
+/*-------------------------------------------------------------------------
  * Function:    H5Pset_efile_prefix
  *
  * Purpose:     Set a prefix to be used for any external files.
@@ -1165,3 +1293,4 @@ H5Pget_efile_prefix(hid_t plist_id, char *prefix, size_t size)
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_efile_prefix() */
+