[svn-r25544] - add a new version of H5Lis_registered.

- rename external log plugin test in examples.

7 files changed, 67 insertions, 13 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 85668e9..55b6b09 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -38,7 +38,7 @@ EXAMPLE_PROG = h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
            h5_crtatt h5_crtgrp h5_crtdat \
            h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
            h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg \
-           h5_external_log_native_vol
+           h5_vol_external_log_native
 TEST_SCRIPT=testh5cc.sh 
 TEST_EXAMPLES_SCRIPT=$(INSTALL_SCRIPT_FILES)
 
@@ -50,7 +50,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
           h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
           h5_ref2reg.c h5_shared_mesg.c ph5example.c \
-          h5_external_log_native_vol.c
+          h5_vol_external_log_native.c
 
 
 
@@ -119,7 +119,7 @@ h5_dtransform: $(srcdir)/h5_dtransform.c
 h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
 h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
 h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
-h5_external_log_native_vol: $(srcdir)/h5_external_log_native_vol.c
+h5_vol_external_log_native: $(srcdir)/h5_vol_external_log_native.c
 
 if BUILD_SHARED_SZIP_CONDITIONAL
 LD_LIBRARY_PATH=$(LL_PATH)
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 48b3221..aaa595d 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -625,7 +625,7 @@ EXAMPLE_PROG = h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
            h5_crtatt h5_crtgrp h5_crtdat \
            h5_group h5_select h5_attribute h5_mount h5_reference h5_drivers \
            h5_ref2reg h5_extlink h5_elink_unix2win h5_shared_mesg \
-           h5_external_log_native_vol
+           h5_vol_external_log_native
 
 TEST_SCRIPT = testh5cc.sh 
 TEST_EXAMPLES_SCRIPT = $(INSTALL_SCRIPT_FILES)
@@ -638,7 +638,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
           h5_reference.c h5_drivers.c h5_extlink.c h5_elink_unix2win.c   \
           h5_ref2reg.c h5_shared_mesg.c ph5example.c \
-          h5_external_log_native_vol.c
+          h5_vol_external_log_native.c
 
 
 # The external link examples demonstrate how to use paths; they need
@@ -1091,7 +1091,7 @@ h5_dtransform: $(srcdir)/h5_dtransform.c
 h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS)
 h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS)
 h5_shared_mesg: $(srcdir)/h5_shared_mesg.c
-h5_external_log_native_vol: $(srcdir)/h5_external_log_native_vol.c
+h5_vol_external_log_native: $(srcdir)/h5_vol_external_log_native.c
 
 # How to create EXAMPLEDIR if it doesn't already exist
 $(EXAMPLEDIR):
diff --git a/examples/h5_external_log_native_vol.c b/examples/h5_vol_external_log_native.c
index 658c73a..625403f 100644
--- a/examples/h5_external_log_native_vol.c
+++ b/examples/h5_vol_external_log_native.c
@@ -162,6 +162,8 @@ int main(int argc, char **argv) {
         under_fapl = H5Pcreate (H5P_FILE_ACCESS);

         H5Pset_fapl_native(under_fapl);

         vol_id = H5VLregister (&H5VL_log_g);

+        assert(H5VLis_registered(&H5VL_log_g) == 1);

+

         acc_tpl = H5Pcreate (H5P_FILE_ACCESS);

         H5Pset_vol(acc_tpl, vol_id, &under_fapl);

 

@@ -240,7 +242,7 @@ int main(int argc, char **argv) {
         H5Pclose(under_fapl);

         

         H5VLunregister (vol_id);

-

+        assert(H5VLis_registered(&H5VL_log_g) == 0);

 	return 0;

 }

 

diff --git a/src/H5I.c b/src/H5I.c
index 7a5b48e..4839624 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -2489,7 +2489,7 @@ H5I__get_id_cb(void *_item, void UNUSED *_key, void *_udata)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5I_get_id(void *object, H5I_type_t type)
+H5I_get_id(const void *object, H5I_type_t type)
 {
     hid_t  ret_value = FAIL;      /* Return value */
     H5I_id_type_t   *type_ptr;      /*ptr to the type       */
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index a902be5..ef8b3d3 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -88,7 +88,7 @@ H5_DLL int H5I_dec_app_ref_always_close(hid_t id);
 H5_DLL herr_t H5I_dec_type_ref(H5I_type_t type);
 H5_DLL herr_t H5I_register_aux(hid_t id, void *aux_ptr);
 H5_DLL void *H5I_get_aux(hid_t id);
-H5_DLL hid_t H5I_get_id(void *object, H5I_type_t type);
+H5_DLL hid_t H5I_get_id(const void *object, H5I_type_t type);
 
 #endif /* _H5Iprivate_H */
 
diff --git a/src/H5VL.c b/src/H5VL.c
index 6e8823b..8d88e9a 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -51,6 +51,10 @@ static herr_t H5VL_free_cls(H5VL_class_t *cls);
 /*******************/
 /* Local Variables */
 /*******************/
+typedef struct {
+    const H5VL_class_t *vol_cls;
+    hid_t ret_id;
+} H5VL_is_registered_ud_t;
 
 /* VOL ID class */
 static const H5I_class_t H5I_VOL_CLS[1] = {{
@@ -289,6 +293,39 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5VL__is_registered_cb
+ *
+ * Purpose:	Callback routine to search through registered VLs
+ *
+ * Return:	Success:	The first object in the type for which FUNC
+ *				returns non-zero. NULL if FUNC returned zero
+ *				for every object in the type.
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *		Friday, March 30, 2012
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+H5VL__is_registered_cb(void *obj, hid_t id, void *_op_data)
+{
+    H5VL_is_registered_ud_t *op_data = (H5VL_is_registered_ud_t *)_op_data; /* User data for callback */
+    H5VL_class_t *cls = (H5VL_class_t *)obj;
+    int ret_value;     /* Callback return value */
+
+    FUNC_ENTER_STATIC_NOERR
+
+    if(cls->value == op_data->vol_cls->value) {
+        op_data->ret_id = id;
+        ret_value = H5_ITER_STOP;
+    }
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5VL__is_registered_cb() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5VLis_registered
  *
  * Purpose:	Tests whether a VOL class has been registered or not
@@ -303,15 +340,22 @@ done:
  *-------------------------------------------------------------------------
  */
 htri_t
-H5VLis_registered(hid_t id)
+H5VLis_registered(const H5VL_class_t *cls)
 {
+    H5VL_is_registered_ud_t op_data;
     htri_t ret_value = FALSE;     /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("t", "i", id);
+    H5TRACE1("t", "*x", cls);
+
+    op_data.ret_id = FAIL;
+    op_data.vol_cls = cls;
 
     /* Check arguments */
-    if(NULL != H5I_object_verify(id, H5I_VOL))
+    if(H5I_iterate(H5I_VOL, H5VL__is_registered_cb, &op_data, TRUE) < 0)
+        HGOTO_ERROR(H5E_VOL, H5E_BADITER, FAIL, "can't iterate over VOL ids")
+
+    if(op_data.ret_id != FAIL)
         ret_value = TRUE;
 
 done:
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index 73c5b6a..d0598d3 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -428,10 +428,18 @@ H5_DLL herr_t H5VLrequest_wait(void **req, H5VL_t *vol_plugin, H5ES_status_t *st
 /* Function prototypes */
 H5_DLL hid_t H5VLregister(const H5VL_class_t *cls);
 H5_DLL herr_t H5VLunregister(hid_t plugin_id);
-H5_DLL htri_t H5VLis_registered(hid_t id);
+H5_DLL htri_t H5VLis_registered(const H5VL_class_t *cls);
 H5_DLL ssize_t H5VLget_plugin_name(hid_t id, char *name/*out*/, size_t size);
 H5_DLL hid_t H5VLobject_register(void *obj, H5I_type_t obj_type, const H5VL_class_t *cls);
 H5_DLL herr_t H5VLget_object(hid_t obj_id, void **obj, H5VL_t **vol_plugin);
+#if 0
+    H5_DLL hid_t H5VLregister_by_name(const char *plugin_name);
+    H5_DLL herr_t H5VLinitialize(hid_t plugin_id, hid_t vipl_id);
+    H5_DLL herr_t H5VLterminate(hid_t plugin_id, hid_t vtpl_id);
+    H5_DLL hid_t H5VLget_plugin_id(H5VL_class_value_t or char *);
+    H5_DLL herr_t H5VLclose(hid_t plugin_id);
+    H5_DLL herr_t H5VLioctl(hid_t loc_id or vol_id, <class enum>, ...);
+#endif
 
 #ifdef __cplusplus
 }