Improve documentation for H5Pget_actual_selection_io_mode() and remove

inappropriate calls to H5CX_set_dxpl() from H5M.c.
HDFGroup · Sep 12, 2023 · 2ec2d48 · 2ec2d48
1 parent 36e49e5
commit 2ec2d48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 27 deletions.
diff --git a/src/H5M.c b/src/H5M.c
@@ -893,9 +893,6 @@ H5Mget_count(hid_t map_id, hsize_t *count /*out*/, hid_t dxpl_id)
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.get.get_type             = H5VL_MAP_GET_COUNT;
     map_args.get.args.get_count.count = 0;
@@ -952,9 +949,6 @@ H5M__put_api_common(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.put.key_mem_type_id   = key_mem_type_id;
     map_args.put.key               = key;
@@ -1087,9 +1081,6 @@ H5M__get_api_common(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.get_val.key_mem_type_id   = key_mem_type_id;
     map_args.get_val.key               = key;
@@ -1225,9 +1216,6 @@ H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists,
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.exists.key_mem_type_id = key_mem_type_id;
     map_args.exists.key             = key;
@@ -1305,9 +1293,6 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op,
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.specific.specific_type                    = H5VL_MAP_ITER;
     map_args.specific.args.iterate.loc_params.type     = H5VL_OBJECT_BY_SELF;
@@ -1394,9 +1379,6 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_m
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.specific.specific_type                                        = H5VL_MAP_ITER;
     map_args.specific.args.iterate.loc_params.type                         = H5VL_OBJECT_BY_NAME;
@@ -1462,9 +1444,6 @@ H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id)
     else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
 
-    /* Set DXPL for operation */
-    H5CX_set_dxpl(dxpl_id);
-
     /* Set up VOL callback arguments */
     map_args.specific.specific_type                = H5VL_MAP_DELETE;
     map_args.specific.args.del.loc_params.type     = H5VL_OBJECT_BY_SELF;

diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
@@ -8332,7 +8332,7 @@ H5_DLL herr_t H5Pget_no_selection_io_cause(hid_t plist_id, uint32_t *no_selectio
  *          H5Pget_no_selection_io_cause() can be used to determine the reason
  *          why selection or vector I/O was not performed.
  *
- *          Valid values returned in \p actual_selection_io_mode are listed
+ *          Valid bitflags returned in \p actual_selection_io_mode are listed
  *          as follows.
  *
  *          - #H5D_SCALAR_IO
@@ -8342,12 +8342,17 @@ H5_DLL herr_t H5Pget_no_selection_io_cause(hid_t plist_id, uint32_t *no_selectio
  *          - #H5D_SELECTION_IO
  *          Selection I/O was performed
  *
+ *          0 or more of these can be present in \p actual_selection_io_mode in
+ *          a bitwise fashion, since a single operation can trigger multiple
+ *          instances of I/O, possibly with different types.  A value of \p 0
+ *          indicates no raw data I/O was performed during the operation.
+ *
  *          Be aware that this function will only include raw data I/O performed
- *          as part of the last I/O operation.  Any metadata flushes, including
- *          attribute and compact dataset I/O, is disregarded.  It is also
- *          possible that data was cached in the dataset chunk cache or sieve
- *          buffer, which may prevent I/O from hitting the disk, and thereby
- *          prevent it from being counted by this function.
+ *          to/from disk as part of the last I/O operation.  Any metadata
+ *          I/O, including attribute and compact dataset I/O, is disregarded.
+ *          It is also possible that data was cached in the dataset chunk cache
+ *          or sieve buffer, which may prevent I/O from hitting the disk, and
+ *          thereby prevent it from being counted by this function.
  *
  * \since 1.14.2
  *