Skip to content

Commit

Permalink
Hdf5 1 8 22 - Reverts lock/unlock callback signature to 1.8.21 version (
Browse files Browse the repository at this point in the history 
#267)

* Restores maintainer mode in the autotools (#200)

Maintainer mode should be enabled in development branches.

Also adds helpful commenting.

Add bin/switch_maint_mode
Disable maintainer mode for release.
Fix incomplete merge for stub functions in H5Fdhdfs.c

* Update configure for Restores maintainer mode in the autotools (#200).

* Update MANIFEST for switch_maint_mode script.

* Update so numbers for 1.8.22 release.

* Add so numbers changes in Makefile.ins for 1.8.22 release.

* Update pkgconfig settings with version - #218 (#223)

* Add notice of final HDFF5 1.8 release.
Add solaris 64bit alignment issue to "Known Problems".

* Update 1.8 final release notice.

* Update CMake/HDF5Examples version in bin/release

* Fixed typo in an error message. (#227)

* Remove duplicate setting (#239)

* RELEASE.txt cleanup.

* Add macOS Big Sur to tested machines, also missing entries for macOS 10.13 and 10.14.

* )Update version.

* Reverts lock/unlock callback signature to 1.8.21 version (#254)

* Reverts lock/unlock callback signature to 1.8.21 version

This callback is unused in 1.8. The ros3 and hdfs VFDs are the only VFDs
that have the lock callback implemented and that is just as no-op stubs.
These stubs were removed so the callbacks are now NULL pointers, like
the other VFDs in 1.8.

* Trivial whitespace fix

* Update version to 1.8.22-14.

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Co-authored-by: bmribler <39579120+bmribler@users.noreply.github.com>
  • Loading branch information
@lrknox @derobins
@byrnHDF @bmribler
4 people authored Jan 16, 2021
1 parent 28b6191 commit f266b51
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 136 deletions.
2 changes: 1 addition & 1 deletion README.txt
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion c++/src/cpp_doc_config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/scripts/HDF5config.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
22 changes: 11 additions & 11 deletions configure
View file
Original file line number Diff line number Diff line change
@@ -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 <help@hdfgroup.org>.
#
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -30282,7 +30282,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."

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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
2 changes: 1 addition & 1 deletion release_docs/RELEASE.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
61 changes: 2 additions & 59 deletions src/H5FDhdfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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 */
};

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/H5FDpublic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
61 changes: 2 additions & 59 deletions src/H5FDros3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
};

Expand Down Expand Up @@ -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 */

0 comments on commit f266b51

Please sign in to comment.