Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify property copying between lists internally #4551

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Simplify property copying between lists internally #4551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
921b536
Simplify property copying internally
mattjala Jun 6, 2024
ede5d49
update H5Pcopy_prop comment
mattjala Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/H5P.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,8 +1331,8 @@ H5Premove(hid_t plist_id, const char *name)
property information will be copied from the source class into the
destination class.

If a property is copied from one list to another, the property will be
first deleted from the destination list (generating a call to the 'close'
If a property is copied from one list to another list that already contains the property,
the property will be first deleted from the destination list (generating a call to the 'del'
callback for the property, if one exists) and then the property is copied
from the source list to the destination list (generating a call to the
'copy' callback for the property, if one exists).
Expand Down
51 changes: 22 additions & 29 deletions src/H5Pint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4862,15 +4862,16 @@ H5P_remove(H5P_genplist_t *plist, const char *name)
DESCRIPTION
Copies a property from one property list to another.

If a property is copied from one list to another, the property will be
first deleted from the destination list (generating a call to the 'close'
If the property exists in the destination list, the property will be
first deleted from the destination list (generating a call to the 'del'
callback for the property, if one exists) and then the property is copied
from the source list to the destination list (generating a call to the
'copy' callback for the property, if one exists).

If the property does not exist in the destination list, this call is
equivalent to calling H5Pinsert2 and the 'create' callback will be called
(if such a callback exists for the property).
If the property does not exist in the destination list, a new instance
of the property is created, the 'create' callback is called
(if such a callback exists for the property), and the new property is
inserted into the destination list.

GLOBAL VARIABLES
COMMENTS, BUGS, ASSUMPTIONS
Expand All @@ -4895,15 +4896,16 @@ H5P__copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_id)))
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property object doesn't exist");

/* Get the pointer to the source property */
if (NULL == (prop = H5P__find_prop_plist(src_plist, name)))
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist");

/* If the property exists in the destination already */
if (NULL != H5P__find_prop_plist(dst_plist, name)) {
/* Delete the property from the destination list, calling the 'close' callback if necessary */
/* Delete the property from the destination list, calling the 'del' callback if necessary */
if (H5P_remove(dst_plist, name) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property");

/* Get the pointer to the source property */
prop = H5P__find_prop_plist(src_plist, name);

/* Make a copy of the source property */
if ((new_prop = H5P__dup_prop(prop, H5P_PROP_WITHIN_LIST)) == NULL)
HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property");
Expand All @@ -4913,21 +4915,12 @@ H5P__copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
if ((new_prop->copy)(new_prop->name, new_prop->size, new_prop->value) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "Can't copy property");
} /* end if */

/* Insert the initialized property into the property list */
if (H5P__add_prop(dst_plist->props, new_prop) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into list");

/* Increment the number of properties in list */
dst_plist->nprops++;
} /* end if */
/* If not, get the information required to do an H5Pinsert2 with the property into the destination list */
} /* end if */
/* If property doesn't exist in destination */
else {
/* Get the pointer to the source property */
if (NULL == (prop = H5P__find_prop_plist(src_plist, name)))
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist");

/* Create property object from parameters */
/* Create property object from parameters. This is very similar to the property
* duplication call above, but the property's name is treated differently depending on
* whether the source property is defined on a plist or a plist class */
if (NULL ==
(new_prop = H5P__create_prop(prop->name, prop->size, H5P_PROP_WITHIN_LIST, prop->value,
prop->create, prop->set, prop->get, prop->encode, prop->decode,
Expand All @@ -4939,14 +4932,14 @@ H5P__copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
if ((new_prop->create)(new_prop->name, new_prop->size, new_prop->value) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "Can't initialize property");
} /* end if */
} /* end else */

/* Insert property into property list class */
if (H5P__add_prop(dst_plist->props, new_prop) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into class");
/* Insert the initialized property into the property list */
if (H5P__add_prop(dst_plist->props, new_prop) < 0)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "Can't insert property into list");

/* Increment property count for class */
dst_plist->nprops++;
} /* end else */
/* Increment the number of properties in list */
dst_plist->nprops++;

done:
/* Cleanup, if necessary */
Expand Down
Loading