summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2018-03-15 18:08:00 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2018-03-15 18:08:00 (GMT)
commitf398e7770774841570832617b0e4f8ea85f6d693 (patch)
treecc08f983062dd8e0c0cd7ab1ce5f11b563df9bd4
parent429843a5b9299a6b93f4d3b28ff794ccb88fe950 (diff)
parent02a9433fa0aac34ae81ab5f0d5b97a7934881215 (diff)
downloadhdf5-f398e7770774841570832617b0e4f8ea85f6d693.zip
hdf5-f398e7770774841570832617b0e4f8ea85f6d693.tar.gz
hdf5-f398e7770774841570832617b0e4f8ea85f6d693.tar.bz2
Merge pull request #965 in HDFFV/hdf5 from develop to hdf5_1_10
* commit '02a9433fa0aac34ae81ab5f0d5b97a7934881215': Add 2 parallel test files to CHECK-CLEANFILES so that if their tests fail before removing them, make check-clean will remove them. Fixed memory leak Description: Added LinkCreatPropList to initH5cpp to cleaning up resource at exit. Platforms tested: Linux/64 (jelly) Linux/ppc64 (ostrich) HDFFV-10412 add note for new H5error_on Java API
-rw-r--r--c++/src/H5Library.cpp4
-rw-r--r--release_docs/RELEASE.txt10
-rw-r--r--testpar/Makefile.am5
3 files changed, 13 insertions, 6 deletions
diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp
index 55f82f5..2cbdfba 100644
--- a/c++/src/H5Library.cpp
+++ b/c++/src/H5Library.cpp
@@ -188,6 +188,10 @@ void H5Library::initH5cpp()
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating LinkAccPropList::deleteConstants failed");
+ ret_value = std::atexit(LinkCreatPropList::deleteConstants);
+ if (ret_value != 0)
+ throw LibraryIException("H5Library::initH5cpp", "Registrating LinkCreatPropList::deleteConstants failed");
+
ret_value = std::atexit(FileAccPropList::deleteConstants);
if (ret_value != 0)
throw LibraryIException("H5Library::initH5cpp", "Registrating FileAccPropList::deleteConstants failed");
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 35eaea4..b85073d 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -118,12 +118,12 @@ New Features
- Add an enumerated value to H5F_libver_t for H5Pset_libver_bounds().
Currently, the library defines two values for H5F_libver_t and supports
- only two pairs of (low, high) combinations as derived from these values.
+ only two pairs of (low, high) combinations as derived from these values.
Thus the bounds setting via H5Pset_libver_bounds() is rather restricted.
- Add an enumerated value (H5F_LIBVER_V18) to H5F_libver_t and
- H5Pset_libver_bounds() now supports five pairs of (low, high) combinations
- as derived from these values. This addition provides the user more
+ Add an enumerated value (H5F_LIBVER_V18) to H5F_libver_t and
+ H5Pset_libver_bounds() now supports five pairs of (low, high) combinations
+ as derived from these values. This addition provides the user more
flexibility in setting bounds for object creation.
(VC - 2018/03/14)
@@ -737,7 +737,7 @@ Bug Fixes since HDF5-1.10.1 release
and closed, the library truncated the file to the stored EOA.
Add an option to the tool in setting the file's stored EOA in the
- superblock to the maximum of (EOA, EOF) + increment.
+ superblock to the maximum of (EOA, EOF) + increment.
Another option is also added to print the file's EOA and EOF.
(VC - 2018/03/14, HDFFV-10360)
diff --git a/testpar/Makefile.am b/testpar/Makefile.am
index 1f15830..5c7cb26 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -37,9 +37,12 @@ LDADD = $(LIBH5TEST) $(LIBHDF5)
# Temporary files
# MPItest.h5 is from t_mpi
# Para*.h5 are from testphdf
+# bigio_test.h5 is from t_bigio
+# ShapeSameTest.h5 is from t_shapesame
# shutdown.h5 is from t_pshutdown
# after_mpi_fin.h5 is from t_init_term
# go is used for debugging. See testphdf5.c.
-CHECK_CLEANFILES+=MPItest.h5 Para*.h5 CacheTestDummy.h5 shutdown.h5 after_mpi_fin.h5 go
+CHECK_CLEANFILES+=MPItest.h5 Para*.h5 bigio_test.h5 CacheTestDummy.h5 \
+ ShapeSameTest.h5 shutdown.h5 after_mpi_fin.h5 go
include $(top_srcdir)/config/conclude.am