[svn-r25352] register new properties.. still not used at the IOD level.

4 files changed, 25 insertions, 5 deletions

diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 8f56d7c..f5d4ce6 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -201,6 +201,9 @@ H5FL_BLK_EXTERN(type_conv);
 /* Property value defaults */
 #ifdef H5_HAVE_EFF
 static const hbool_t H5D_def_append_only_g = H5D_CRT_APPEND_ONLY_DEF;
+static const H5FF_dset_dim_layout_t H5D_def_dims_order_g = H5D_CRT_DIMS_ORDER_DEF;
+static const size_t H5D_def_stripe_count_g = H5D_CRT_STRIPE_COUNT_DEF;
+static const size_t H5D_def_stripe_size_g = H5D_CRT_STRIPE_SIZE_DEF;
 #endif
 static const H5O_layout_t H5D_def_layout_g = H5D_CRT_LAYOUT_DEF;        /* Default storage layout */
 static const H5O_fill_t H5D_def_fill_g = H5D_CRT_FILL_VALUE_DEF;        /* Default fill value */
@@ -248,6 +251,24 @@ H5P__dcrt_reg_prop(H5P_genclass_t *pclass)
                          NULL, NULL, NULL, H5D_CRT_APPEND_ONLY_ENC, H5D_CRT_APPEND_ONLY_DEC, 
                          NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+
+    if(H5P_register_real(pclass, H5D_CRT_DIMS_ORDER_NAME, H5D_CRT_DIMS_ORDER_SIZE, 
+                         &H5D_def_dims_order_g,
+                         NULL, NULL, NULL, H5D_CRT_DIMS_ORDER_ENC, H5D_CRT_DIMS_ORDER_DEC, 
+                         NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+
+    if(H5P_register_real(pclass, H5D_CRT_STRIPE_COUNT_NAME, H5D_CRT_STRIPE_COUNT_SIZE, 
+                         &H5D_def_stripe_count_g,
+                         NULL, NULL, NULL, H5D_CRT_STRIPE_COUNT_ENC, H5D_CRT_STRIPE_COUNT_DEC, 
+                         NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
+
+    if(H5P_register_real(pclass, H5D_CRT_STRIPE_SIZE_NAME, H5D_CRT_STRIPE_SIZE_SIZE, 
+                         &H5D_def_stripe_size_g,
+                         NULL, NULL, NULL, H5D_CRT_STRIPE_SIZE_ENC, H5D_CRT_STRIPE_SIZE_DEC, 
+                         NULL, NULL, NULL, NULL) < 0)
+        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 #endif
 
     /* Register the storage layout property */
diff --git a/src/H5VLiod.h b/src/H5VLiod.h
index 4349b94..19010cd 100644
--- a/src/H5VLiod.h
+++ b/src/H5VLiod.h
@@ -51,7 +51,7 @@ extern "C" {
 #define H5D_XFER_CHECKSUM_NAME "checksum"
 #define H5D_XFER_CHECKSUM_PTR_NAME "checksum_ptr"
 
-#define H5D_CRT_DIM_ORDER_NAME "dim_order"
+#define H5D_CRT_DIMS_ORDER_NAME "dim_order"
 #define H5D_CRT_STRIPE_COUNT_NAME "stripe_count"
 #define H5D_CRT_STRIPE_SIZE_NAME "stripe_size"
 #define H5D_CRT_APPEND_ONLY_NAME "append_only"
diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h
index d16010c..f0257be 100644
--- a/src/H5VLiod_common.h
+++ b/src/H5VLiod_common.h
@@ -30,7 +30,7 @@
 #define IOD_OH_UNDEFINED ((uint64_t)0)//(pow(2.0,64.0) - 1)
 #define IOD_ID_UNDEFINED ((uint64_t)(-1))//(pow(2.0,64.0) - 1)
 #define IOD_COUNT_UNDEFINED ((uint64_t)(-1))//(pow(2.0,64.0) - 1)
-#define H5_EFF_DEBUG 0
+#define H5_EFF_DEBUG 1
 
 /* function shipper IDs for different routines */
 extern hg_id_t H5VL_EFF_INIT_ID;
diff --git a/src/H5VLiod_props.c b/src/H5VLiod_props.c
index 1d507ec..a0bfd84 100644
--- a/src/H5VLiod_props.c
+++ b/src/H5VLiod_props.c
@@ -26,7 +26,6 @@
 #include "H5FFprivate.h"        /* Fast Forward            		*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Pprivate.h"		/* Property lists			*/
-#include "H5Ppkg.h"		/* Property lists			*/
 #include "H5VLiod.h"            /* Iod VOL plugin			*/
 
 #ifdef H5_HAVE_EFF
@@ -813,7 +812,7 @@ H5Pset_dcpl_dim_layout(hid_t dcpl_id, H5FF_dset_dim_layout_t layout)
     if(NULL == (plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dcpl")
 
-    if(H5P_set(plist, H5D_CRT_DIM_ORDER_NAME, &layout) < 0)
+    if(H5P_set(plist, H5D_CRT_DIMS_ORDER_NAME, &layout) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 done:
     FUNC_LEAVE_API(ret_value)
@@ -831,7 +830,7 @@ H5Pget_dcpl_dim_layout(hid_t dcpl_id, H5FF_dset_dim_layout_t *layout)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dcpl")
 
     if(layout)
-        if(H5P_get(plist, H5D_CRT_DIM_ORDER_NAME, layout) < 0)
+        if(H5P_get(plist, H5D_CRT_DIMS_ORDER_NAME, layout) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value")
 done:
     FUNC_LEAVE_API(ret_value)