From d665a0d4cf4d62223a892a43c4270b5701d21e38 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Sat, 3 Oct 2020 15:35:45 -0500 Subject: Correct entries related to --enable-build-mode and --enable-profiling in INSTALL file, and remove obsolete SZIP paragraph from COPYING file. --- COPYING | 6 ------ release_docs/INSTALL | 11 +++++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index 659bf1c..da64ef8 100644 --- a/COPYING +++ b/COPYING @@ -97,10 +97,4 @@ and/or accompanying materials: ----------------------------------------------------------------------------- -HDF5 is available with the SZIP compression library but SZIP is not part -of HDF5 and has separate copyright and license terms. See SZIP Compression -in HDF Products (www.hdfgroup.org/doc_resource/SZIP/) for further details. - ------------------------------------------------------------------------------ - diff --git a/release_docs/INSTALL b/release_docs/INSTALL index d61422e..91ae733 100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL @@ -351,15 +351,18 @@ CONTENTS so it can be debugged with gdb, dbx, ddd, etc., or it can be compiled with various optimizations. To compile for symbolic debugging (the default for snapshots), say - `--enable-build-mode=production'; to compile with optimizations + `--enable-build-mode=debug'; to compile with optimizations (the default for supported public releases), - say `--enable-build-mode=production'. On some systems the + say `--enable-build-mode=production'. For a 'clean slate' configuration + with optimization disabled and nothing turned on, + say `--enable-build-mode=clean'. On some systems the library can also be compiled for profiling with gprof by saying - `--enable-production=profile'. + `--enable-profiling'. $ ./configure --enable-build-mode=debug #symbolic debugging $ ./configure --enable-build-mode=production #optimized code - $ ./configure --enable-production=profile #for use with gprof + $ ./configure --enable-build-mode=clean #'clean slate' + $ ./configure --enable-profiling #for use with gprof Regardless of whether support for symbolic debugging is enabled, the library can also perform runtime debugging of certain packages -- cgit v0.12 From b2e40065d1ad402b6cccd4180d9d61f0e570a17d Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Mon, 5 Oct 2020 15:27:24 +0200 Subject: Fix memory leak in H5PL__find_plugin_in_path When encountering a directory, the current loop iteration was skipped without freeing the memory allocated for the path. --- src/H5PLpath.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/H5PLpath.c b/src/H5PLpath.c index 1858cf8..3879dc6 100644 --- a/src/H5PLpath.c +++ b/src/H5PLpath.c @@ -669,8 +669,10 @@ H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *fo HDstrerror(errno)) /* If it is a directory, skip it */ - if (S_ISDIR(my_stat.st_mode)) + if (S_ISDIR(my_stat.st_mode)) { + path = (char *)H5MM_xfree(path); continue; + } /* attempt to open the dynamic library as a filter library */ if (H5PL__open(path, search_params->type, search_params->key, found, plugin_info) < 0) -- cgit v0.12 From de96f92068476f9568487c7417c9635f0ff5655d Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Sat, 10 Oct 2020 07:38:20 -0500 Subject: Remove 1 addition to src/H5Cmpio.c of member added to H5C_t struct in develop branch inadvertently and partially merged to hdf5_1_12 branch. The addition breaks compile with parallel enabled; removing it restores compile, tested with MPICH 3.3 and OpenMPI 4.0.0. e with '#' will be ignored, and an empty message aborts the commit. --- src/H5Cmpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index e529c58..6c0c015 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -457,7 +457,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t *cache_ptr) entry_ptr = cache_ptr->dLRU_tail_ptr; while ((nominated_entries_size < space_needed) && - ((!cache_ptr->slist_enabled) || (nominated_entries_count < cache_ptr->slist_len)) && + (nominated_entries_count < cache_ptr->slist_len) && (entry_ptr != NULL)) { HDassert(!(entry_ptr->is_protected)); -- cgit v0.12