diff --git a/README.txt b/README.txt index 6ffe44f8d17..f42cb77ae9b 100644 --- a/README.txt +++ b/README.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.22-13 currently under development +HDF5 version 1.8.22-14 currently under development ------------------------------------------------------------------------------ Please refer to the release_docs/INSTALL file for installation instructions. diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index c170179a999..9139abbbdff 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -49,7 +49,7 @@ PROJECT_NAME = "HDF5 C++ API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.8.22-13, currently under development" +PROJECT_NUMBER = "1.8.22-14, currently under development" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 11b5dc3a2f4..a25098dc262 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -38,7 +38,7 @@ cmake_minimum_required (VERSION 3.12) ############################################################################## set (CTEST_SOURCE_VERSION "1.8.22") -set (CTEST_SOURCE_VERSEXT "-13") +set (CTEST_SOURCE_VERSEXT "-14") ############################################################################## # handle input parameters to script. diff --git a/configure b/configure index caec0cefd73..6d424d754e8 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.8.22-13. +# Generated by GNU Autoconf 2.69 for HDF5 1.8.22-14. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.8.22-13' -PACKAGE_STRING='HDF5 1.8.22-13' +PACKAGE_VERSION='1.8.22-14' +PACKAGE_STRING='HDF5 1.8.22-14' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -1511,7 +1511,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.8.22-13 to adapt to many kinds of systems. +\`configure' configures HDF5 1.8.22-14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1581,7 +1581,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.8.22-13:";; + short | recursive ) echo "Configuration of HDF5 1.8.22-14:";; esac cat <<\_ACEOF @@ -1823,7 +1823,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.8.22-13 +HDF5 configure 1.8.22-14 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2760,7 +2760,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.8.22-13, which was +It was created by HDF5 $as_me 1.8.22-14, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3631,7 +3631,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.8.22-13' + VERSION='1.8.22-14' cat >>confdefs.h <<_ACEOF @@ -30282,7 +30282,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -HDF5 config.lt 1.8.22-13 +HDF5 config.lt 1.8.22-14 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -32358,7 +32358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.8.22-13, which was +This file was extended by HDF5 $as_me 1.8.22-14, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32424,7 +32424,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HDF5 config.status 1.8.22-13 +HDF5 config.status 1.8.22-14 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index efcdeef1cea..2f9e85f8786 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.8.22-13], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.8.22-14], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 372fb09253f..c0f1b2ee213 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.8.22-13 currently under development +HDF5 version 1.8.22-14 currently under development ================================================================================ Notice: HDF5 1.8.22 will be followed later in 2021 by HDF5 1.8.23, the final diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index a481777ef78..5a11e446b12 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -286,8 +286,6 @@ static herr_t H5FD_hdfs_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, had static herr_t H5FD_hdfs_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, const void *buf); static herr_t H5FD_hdfs_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing); -static herr_t H5FD_hdfs_lock(H5FD_t *_file, hbool_t rw); -static herr_t H5FD_hdfs_unlock(H5FD_t *_file); static herr_t H5FD_hdfs_validate_config(const H5FD_hdfs_fapl_t *fa); @@ -320,8 +318,8 @@ static const H5FD_class_t H5FD_hdfs_g = { H5FD_hdfs_write, /* write */ NULL, /* flush */ H5FD_hdfs_truncate, /* truncate */ - H5FD_hdfs_lock, /* lock */ - H5FD_hdfs_unlock, /* unlock */ + NULL, /* lock */ + NULL, /* unlock */ H5FD_FLMAP_DICHOTOMY /* fl_map */ }; @@ -1647,61 +1645,6 @@ H5FD_hdfs_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id, h FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_hdfs_truncate() */ -/*------------------------------------------------------------------------- - * - * Function: H5FD_hdfs_lock - * - * Purpose: - * - * Place an advisory lock on a file. - * No effect on Read-Only S3 file. - * - * Suggestion: remove lock/unlock from class - * would result in error at H5FD_[un]lock() (H5FD.c) - * - * Return: - * - * SUCCEED (No-op always succeeds) - * - * Programmer: Jacob Smith - * 2017-11-03 - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_hdfs_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw) -{ - FUNC_ENTER_NOAPI_NOINIT_NOERR - - FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5FD_hdfs_lock() */ - -/*------------------------------------------------------------------------- - * - * Function: H5FD_hdfs_unlock - * - * Purpose: - * - * Remove the existing lock on the file. - * No effect on Read-Only S3 file. - * - * Return: - * - * SUCCEED (No-op always succeeds) - * - * Programmer: Jacob Smith - * 2017-11-03 - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_hdfs_unlock(H5FD_t H5_ATTR_UNUSED *_file) -{ - FUNC_ENTER_NOAPI_NOINIT_NOERR - - FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5FD_hdfs_unlock() */ - #else /* H5_HAVE_LIBHDFS */ /* No-op stubs to avoid binary compatibility problems with previous diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index c5bde158d49..fcedba250c6 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -236,8 +236,8 @@ typedef struct H5FD_class_t { herr_t (*write)(H5FD_t *file, H5FD_mem_t type, hid_t dxpl, haddr_t addr, size_t size, const void *buffer); herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, unsigned closing); herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing); - herr_t (*lock)(H5FD_t *file, hbool_t last); - herr_t (*unlock)(H5FD_t *file); + herr_t (*lock)(H5FD_t *file, unsigned char *oid, unsigned lock_type, hbool_t last); + herr_t (*unlock)(H5FD_t *file, unsigned char *oid, hbool_t last); H5FD_mem_t fl_map[H5FD_MEM_NTYPES]; } H5FD_class_t; diff --git a/src/H5FDros3.c b/src/H5FDros3.c index ecb07c37b8f..237dd8f991d 100644 --- a/src/H5FDros3.c +++ b/src/H5FDros3.c @@ -229,8 +229,6 @@ static herr_t H5FD_ros3_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, had static herr_t H5FD_ros3_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size, const void *buf); static herr_t H5FD_ros3_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing); -static herr_t H5FD_ros3_lock(H5FD_t *_file, hbool_t rw); -static herr_t H5FD_ros3_unlock(H5FD_t *_file); static herr_t H5FD_ros3_validate_config(const H5FD_ros3_fapl_t *fa); static void * H5FD_ros3_fapl_get(H5FD_t *_file); static void * H5FD_ros3_fapl_copy(const void *_old_fa); @@ -265,8 +263,8 @@ static const H5FD_class_t H5FD_ros3_g = { H5FD_ros3_write, /* write */ NULL, /* flush */ H5FD_ros3_truncate, /* truncate */ - H5FD_ros3_lock, /* lock */ - H5FD_ros3_unlock, /* unlock */ + NULL, /* lock */ + NULL, /* unlock */ H5FD_FLMAP_DICHOTOMY /* fl_map */ }; @@ -1575,59 +1573,4 @@ H5FD_ros3_truncate(H5FD_t H5_ATTR_UNUSED *_file, hid_t H5_ATTR_UNUSED dxpl_id, h FUNC_LEAVE_NOAPI(ret_value) } /* end H5FD_ros3_truncate() */ -/*------------------------------------------------------------------------- - * - * Function: H5FD_ros3_lock() - * - * Purpose: - * - * Place an advisory lock on a file. - * No effect on Read-Only S3 file. - * - * Suggestion: remove lock/unlock from class - * > would result in error at H5FD_[un]lock() (H5FD.c) - * - * Return: - * - * SUCCEED (No-op always succeeds) - * - * Programmer: Jacob Smith - * 2017-11-03 - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_ros3_lock(H5FD_t H5_ATTR_UNUSED *_file, hbool_t H5_ATTR_UNUSED rw) -{ - FUNC_ENTER_NOAPI_NOINIT_NOERR - - FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5FD_ros3_lock() */ - -/*------------------------------------------------------------------------- - * - * Function: H5FD_ros3_unlock() - * - * Purpose: - * - * Remove the existing lock on the file. - * No effect on Read-Only S3 file. - * - * Return: - * - * SUCCEED (No-op always succeeds) - * - * Programmer: Jacob Smith - * 2017-11-03 - * - *------------------------------------------------------------------------- - */ -static herr_t -H5FD_ros3_unlock(H5FD_t H5_ATTR_UNUSED *_file) -{ - FUNC_ENTER_NOAPI_NOINIT_NOERR - - FUNC_LEAVE_NOAPI(SUCCEED) -} /* end H5FD_ros3_unlock() */ - #endif /* H5_HAVE_ROS3_VFD */