diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-02-17 16:46:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-02-17 16:46:52 (GMT) |
| commit | fa2b89c6b0c894915f12a1df594ef8c427adbc2d (patch) | |
| tree | fea728f0380438d459ba7c785e3d66da6b1ee4ce /src/H5Dint.c | |
| parent | ddf139aed55ea130eebff56d5385351a01d46508 (diff) | |
| parent | 3f903a441ad84001ea66589728bd8b036b6fdfca (diff) | |
| download | hdf5-fa2b89c6b0c894915f12a1df594ef8c427adbc2d.zip hdf5-fa2b89c6b0c894915f12a1df594ef8c427adbc2d.tar.gz hdf5-fa2b89c6b0c894915f12a1df594ef8c427adbc2d.tar.bz2 | |
Merge pull request #2325 in HDFFV/hdf5 from ~DYOUNG/werror:h5t_copy to develop
Merged per discussion with Elena.
* commit '3f903a441ad84001ea66589728bd8b036b6fdfca':
Take out the temporary performance tests.
Make calls through a function pointer. Use the same number of arguments, always.
Increase iterations, provide a baseline for no-op, simplify the overhead case a bit.
Temporarily add some code that measures the time to run the simplest possible H5T__copy_all()-like routine 10 million times and then measures the version with FUNC_ENTER_STATIC/_LEAVE_NOAPI and a HGOTO_ERROR() statement.
H5T_copy() constification plus Quincey's contributions.
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 0d67fd0..1624f7b 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1534,7 +1534,7 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Shallow copy (take ownership) of the object location object */ - if(H5O_loc_copy(&(dataset->oloc), loc->oloc, H5_COPY_SHALLOW) < 0) + if(H5O_loc_copy_shallow(&(dataset->oloc), loc->oloc) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, NULL, "can't copy object location") /* Shallow copy (take ownership) of the group hier. path */ @@ -3881,7 +3881,7 @@ H5D__get_type(const H5D_t *dset) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to patch datatype's file pointer") /* Copy the dataset's datatype */ - if(NULL == (dt = H5T_copy(dset->shared->type, H5T_COPY_REOPEN))) + if(NULL == (dt = H5T_copy_reopen(dset->shared->type))) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to copy datatype") /* Mark any datatypes as being in memory now */ |