VFD SWMR: sync with develop

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
             os: ubuntu-latest
             build_type: "Release"
             cpp: ON
-            fortran: OFF
+            fortran: ON
             java: ON
             ts: OFF
             hl: ON

.github/workflows/pr-check.yml

@@ -31,7 +31,7 @@ jobs:
             os: ubuntu-latest
             build_type: "Release"
             cpp: ON
-            fortran: OFF
+            fortran: ON
             java: ON
             ts: OFF
             hl: ON

CMakeLists.txt

@@ -1130,7 +1130,6 @@ if (EXISTS "${HDF5_SOURCE_DIR}/c++" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/c++")
       endif ()
     endif ()
 
-    include (${HDF_RESOURCES_EXT_DIR}/HDFUseCXX.cmake)
     include (${HDF_RESOURCES_DIR}/HDFCXXCompilerFlags.cmake)
 
     add_subdirectory (c++)

MANIFEST

@@ -40,7 +40,6 @@
 ./.github/workflows/main.yml  _DO_NOT_DISTRIBUTE_
 ./.github/workflows/pr-check.yml  _DO_NOT_DISTRIBUTE_
 
-./m4/aclocal_cxx.m4
 ./m4/aclocal_fc.m4
 ./m4/aclocal_fc.f90
 ./m4/ax_check_class.m4
@@ -136,6 +135,7 @@
 ./config/cygwin
 ./config/ibm-aix
 ./config/ibm-flags
+./config/intel-cxxflags
 ./config/intel-fflags
 ./config/intel-flags
 ./config/libhdf5.pc.in
@@ -147,6 +147,7 @@
 ./config/lt_vers.am
 ./config/Makefile.am.blank
 ./config/netbsd
+./config/pgi-cxxflags
 ./config/pgi-fflags
 ./config/pgi-flags
 ./config/solaris
@@ -172,6 +173,7 @@
 ./config/gnu-warnings/cxx-4.8
 ./config/gnu-warnings/cxx-4.9
 ./config/gnu-warnings/cxx-5
+./config/gnu-warnings/cxx-9
 ./config/gnu-warnings/cxx-error-5
 ./config/gnu-warnings/cxx-error-general
 ./config/gnu-warnings/cxx-noerror-5
@@ -915,6 +917,7 @@
 ./src/H5L.c
 ./src/H5Ldeprec.c
 ./src/H5Lexternal.c
+./src/H5Lint.c
 ./src/H5Lmodule.h
 ./src/H5Lpkg.h
 ./src/H5Lprivate.h
@@ -1402,8 +1405,10 @@
 ./test/vfd_swmr_addrem_writer.c
 ./test/vfd_swmr_attrdset_writer.c
 ./test/vfd_swmr_bigset_writer.c
+./test/vfd_swmr_check_compat.c
 ./test/vfd_swmr_common.c
 ./test/vfd_swmr_common.h
+./test/vfd_swmr_dsetops_writer.c
 ./test/vfd_swmr_generator.c
 ./test/vfd_swmr_group_writer.c
 ./test/vfd_swmr_reader.c
@@ -3589,7 +3594,6 @@
 ./config/cmake/CTestCustom.cmake
 ./config/cmake/fileCompareTest.cmake
 ./config/cmake/FindHDFS.cmake
-./config/cmake/H5cxx_config.h.in
 ./config/cmake/H5pubconf.h.in
 ./config/cmake/hdf5-config.cmake.in
 ./config/cmake/hdf5-config-version.cmake.in
@@ -3624,11 +3628,9 @@
 ./config/cmake_ext_mod/hdf.bmp
 ./config/cmake_ext_mod/hdf.icns
 ./config/cmake_ext_mod/hdf.ico
-./config/cmake_ext_mod/HDFCXXTests.cpp
 ./config/cmake_ext_mod/HDFLibMacros.cmake
 ./config/cmake_ext_mod/HDFMacros.cmake
 ./config/cmake_ext_mod/HDFTests.c
-./config/cmake_ext_mod/HDFUseCXX.cmake
 ./config/cmake_ext_mod/HDFUseFortran.cmake
 ./config/cmake_ext_mod/NSIS.InstallOptions.ini.in
 ./config/cmake_ext_mod/NSIS.template.in

bin/trace

@@ -283,8 +283,8 @@ my $file_api = 0;
 my $file_args = 0;
 my $total_api = 0;
 my $total_args = 0;
-sub rewrite_func ($$$$$$$$) {
-  my ($file, $begin, $type, $aftertype, $name, $args, $close, $body) = @_;
+sub rewrite_func ($$$$$) {
+  my ($file, $type, $name, $args, $body) = @_;
   my ($arg, $trace, $argtrace);
   my (@arg_name, @arg_str, @arg_type);
   local $_;
@@ -352,10 +352,32 @@ sub rewrite_func ($$$$$$$$) {
     $argtrace = "H5ARG_TRACE" . scalar(@arg_str) . "(FUNC, \"";
     $trace .= join("", @arg_str) . "\"";
     $argtrace .= join("", @arg_str) . "\"";
-    my $len = 4 + length $trace;        # Add 4, for indenting the line
-    for (@arg_name) {
-      # Wrap lines that will be longer than the limit, after ');' is added
-      if ($len + length >= ($max_trace_macro_line_len - 2)) {
+
+    # Add 4 for indenting the line
+    my $len = 4 + length($trace);
+
+    for my $i (0 .. $#arg_name) {
+      # Handle wrapping
+
+      # Be VERY careful here! clang-format and this script MUST agree
+      # on which lines get wrapped or there will be churn as each tries
+      # to undo the other's output.
+      #
+      # TWO cases must be handled:
+      # 1) The argument is that last one and ');' will be appended
+      # 2) The argument is NOT the last one and ',' will be appended
+      #
+      # NB: clang-format does NOT consider terminal newlines when
+      #     counting columns for the ColumnLimit
+      #
+      # The extra '2' added after $len includes the ', ' that would be
+      # added BEFORE the argument.
+      #
+      my $adjust = ($i + 1 == scalar(@arg_str)) ? 2 : 1;
+      my $len_if_added = $len + 2 + length($arg_name[$i]) + $adjust;
+
+      # Wrap lines that will be longer than the limit
+      if ($len_if_added > $max_trace_macro_line_len) {
         # Wrap line, with indention
         $trace .= ",\n             ";
         $len = 13;              # Set to 13, for indention
@@ -371,9 +393,11 @@ sub rewrite_func ($$$$$$$$) {
       }
 
       # Append argument
-      $trace .= "$_";
-      $argtrace .= ", $_";
-      $len += length;     # Add length of appended argument name
+      $trace .= "$arg_name[$i]";
+      $argtrace .= ", $arg_name[$i]";
+
+      # Add length of appended argument name
+      $len += length($arg_name[$i]);
     }
 
     # Append final ');' for macro
@@ -459,7 +483,7 @@ sub rewrite_func ($$$$$$$$) {
   }
 
  error:
-  return "\n$begin$type$aftertype$name($orig_args)$close$body";
+  return "\n$type\n$name($orig_args)\n$body";
 }
 
 ##############################################################################
@@ -481,25 +505,12 @@ for $file (@ARGV) {
     # Make a copy of the original data
     my $original = $Source;
 
-    # Check which style of function declaration is used in this file
-    if ( $Source =~ /BEGIN_FUNC/ ) {
-        # Make modifications
-        $Source =~ s/\n(BEGIN_FUNC.*?\n)                      #begin
-                        ([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)  #type
-                        (.*?\n)                               #aftertype
-                         (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*)      #name
-                         \s*\((.*?)\)\s*                      #args
-                         (\))                                 #close
-                         (\n.*?\nEND_FUNC\([^\n]*)            #body
-                         /rewrite_func($file,$1,$2,$4,$5,$6,$7,$8)/segx;
-    } else {
-        # Make modifications
-        $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type
-                         (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*)      #name
-                         \s*\((.*?)\)\s*                      #args
-                         (\{.*?\n\}[^\n]*)                    #body
-                         /rewrite_func($file,"",$1,"\n",$3,$4,"\n",$5)/segx;
-    }
+    # Make modifications
+    $Source =~ s/\n([A-Za-z]\w*(\s+[A-Za-z]\w*)*\s*\**)\n #type
+                     (H5[A-Z]{0,2}_?[a-zA-Z0-9_]\w*)      #name
+                     \s*\((.*?)\)\s*                      #args
+                     (\{.*?\n\}[^\n]*)                    #body
+                     /rewrite_func($file,$1,$3,$4,$5)/segx;
 
 # If the source changed then print out the new version
     if ($original ne $Source) {

c++/src/CMakeLists.txt

@@ -1,13 +1,6 @@
 cmake_minimum_required (VERSION 3.12)
 project (HDF5_CPP_SRC CXX)
 
-#-----------------------------------------------------------------------------
-# Generate configure file
-#-----------------------------------------------------------------------------
-configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in
-                ${HDF5_SRC_BINARY_DIR}/H5cxx_pubconf.h
-)
-
 #-----------------------------------------------------------------------------
 # Define cpp Library
 #-----------------------------------------------------------------------------

c++/src/H5Cpp.h

@@ -48,14 +48,4 @@
 #include "H5File.h"
 #include "H5Library.h"
 
-/* Some C++ compilers do not have offsetof macro; define to bypass the problem
-   - BMR- -EIP- 2007/08/01
-*/
-#ifndef H5_CXX_HAVE_OFFSETOF
-#ifdef HOFFSET
-#undef HOFFSET
-#endif
-#define HOFFSET(TYPE, MEMBER) ((size_t) & ((TYPE *)0)->MEMBER)
-#endif
-
 #endif // H5Cpp_H

c++/src/H5DataSpace.cpp

@@ -88,9 +88,8 @@ const DataSpace &DataSpace::ALL = *getConstant();
 ///\exception   H5::DataSpaceIException
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace(H5S_class_t type) : IdComponent()
+DataSpace::DataSpace(H5S_class_t type) : IdComponent(), id{H5Screate(type)}
 {
-    id = H5Screate(type);
     if (id < 0) {
         throw DataSpaceIException("DataSpace constructor", "H5Screate failed");
     }
@@ -105,9 +104,9 @@ DataSpace::DataSpace(H5S_class_t type) : IdComponent()
 ///\exception   H5::DataSpaceIException
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataSpace::DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims) : IdComponent()
+DataSpace::DataSpace(int rank, const hsize_t *dims, const hsize_t *maxdims)
+    : IdComponent(), id{H5Screate_simple(rank, dims, maxdims)}
 {
-    id = H5Screate_simple(rank, dims, maxdims);
     if (id < 0) {
         throw DataSpaceIException("DataSpace constructor", "H5Screate_simple failed");
     }

c++/src/H5DataType.cpp

@@ -76,10 +76,9 @@ DataType::DataType(const hid_t existing_id) : H5Object(), id(existing_id), encod
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-DataType::DataType(const H5T_class_t type_class, size_t size) : H5Object(), encoded_buf(NULL), buf_size(0)
+DataType::DataType(const H5T_class_t type_class, size_t size)
+    : H5Object(), id{H5Tcreate(type_class, size)}, encoded_buf(NULL), buf_size(0)
 {
-    // Call C routine to create the new datatype
-    id = H5Tcreate(type_class, size);
     if (id < 0) {
         throw DataTypeIException("DataType constructor", "H5Tcreate failed");
     }
@@ -97,9 +96,10 @@ DataType::DataType(const H5T_class_t type_class, size_t size) : H5Object(), enco
 // Programmer   Binh-Minh Ribler - Oct, 2006
 //--------------------------------------------------------------------------
 DataType::DataType(const H5Location &loc, const void *ref, H5R_type_t ref_type, const PropList &plist)
-    : H5Object(), encoded_buf(NULL), buf_size(0)
+    : H5Object(), id{H5Location::p_dereference(loc.getId(), ref, ref_type, plist,
+                                               "constructor - by dereference")},
+      encoded_buf(NULL), buf_size(0)
 {
-    id = H5Location::p_dereference(loc.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
 
 //--------------------------------------------------------------------------
@@ -146,10 +146,9 @@ DataType::DataType(const DataType &original) : H5Object(), id(original.id), enco
 //              unnecessarily and will produce undefined behavior.
 //              -BMR, Apr 2015
 //--------------------------------------------------------------------------
-DataType::DataType(const PredType &pred_type) : H5Object(), encoded_buf(NULL), buf_size(0)
+DataType::DataType(const PredType &pred_type)
+    : H5Object(), id{H5Tcopy(pred_type.getId())}, encoded_buf(NULL), buf_size(0)
 {
-    // Call C routine to copy the datatype
-    id = H5Tcopy(pred_type.getId());
     if (id < 0)
         throw DataTypeIException("DataType constructor", "H5Tcopy failed");
 }
@@ -168,9 +167,9 @@ DataType::DataType(const PredType &pred_type) : H5Object(), encoded_buf(NULL), b
 //              improve usability.
 //              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-DataType::DataType(const H5Location &loc, const char *dtype_name) : H5Object(), encoded_buf(NULL), buf_size(0)
+DataType::DataType(const H5Location &loc, const char *dtype_name)
+    : H5Object(), id{p_opentype(loc, dtype_name)}, encoded_buf(NULL), buf_size(0)
 {
-    id = p_opentype(loc, dtype_name);
 }
 
 //--------------------------------------------------------------------------
@@ -188,9 +187,8 @@ DataType::DataType(const H5Location &loc, const char *dtype_name) : H5Object(),
 //              -BMR, Dec 2016
 //--------------------------------------------------------------------------
 DataType::DataType(const H5Location &loc, const H5std_string &dtype_name)
-    : H5Object(), encoded_buf(NULL), buf_size(0)
+    : H5Object(), id{p_opentype(loc, dtype_name.c_str())}, encoded_buf(NULL), buf_size(0)
 {
-    id = p_opentype(loc, dtype_name.c_str());
 }
 
 //--------------------------------------------------------------------------
@@ -318,7 +316,7 @@ DataType::encode()
 
     // Allocate buffer and call C function again to encode
     if (buf_size > 0) {
-        encoded_buf = (unsigned char *)HDcalloc((size_t)1, buf_size);
+        encoded_buf = static_cast<unsigned char *>(HDcalloc(1, buf_size));
         ret_value   = H5Tencode(id, encoded_buf, &buf_size);
         if (ret_value < 0) {
             throw DataTypeIException("DataType::encode", "H5Tencode failed");

c++/src/H5DxferProp.cpp

@@ -175,7 +175,7 @@ DSetMemXferPropList::getBuffer(void **tconv, void **bkg) const
 void
 DSetMemXferPropList::setPreserve(bool status) const
 {
-    herr_t ret_value = H5Pset_preserve(id, (hbool_t)status);
+    herr_t ret_value = H5Pset_preserve(id, static_cast<hbool_t>(status));
     if (ret_value < 0) {
         throw PropListIException("DSetMemXferPropList::setPreserve", "H5Pset_preserve failed");
     }
@@ -314,7 +314,7 @@ DSetMemXferPropList::getDataTransform() const
     H5std_string expression;
 
     // Preliminary call to get the expression's length
-    ssize_t exp_len = H5Pget_data_transform(id, NULL, (size_t)0);
+    ssize_t exp_len = H5Pget_data_transform(id, NULL, 0);
 
     // If H5Pget_data_transform returns a negative value, raise an exception
     if (exp_len < 0) {

c++/src/H5Exception.cpp

@@ -25,7 +25,7 @@ const char Exception::DEFAULT_MSG[] = "No detailed information provided";
 ///\brief       Default constructor.
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-Exception::Exception()
+Exception::Exception() : detail_message{""}, func_name{""}
 {
 }
 

c++/src/H5File.cpp

@@ -165,9 +165,8 @@ H5File::p_get_file(const char *name, unsigned int flags, const FileCreatPropList
 //              constructor is needed by the library in order to return
 //              an object, H5File doesn't need it. -BMR (HDFFV-8766 partially)
 //--------------------------------------------------------------------------
-H5File::H5File(hid_t existing_id) : Group()
+H5File::H5File(hid_t existing_id) : Group(), id{existing_id}
 {
-    id = existing_id;
     incRefCount(); // increment number of references to this id
 }
 
@@ -180,9 +179,8 @@ H5File::H5File(hid_t existing_id) : Group()
 ///\param       original - IN: H5File instance to copy
 // December 2000
 //--------------------------------------------------------------------------
-H5File::H5File(const H5File &original) : Group(original)
+H5File::H5File(const H5File &original) : Group(original), id{original.getId()}
 {
-    id = original.getId();
     incRefCount(); // increment number of references to this id
 }
 

c++/src/H5LcreatProp.cpp

@@ -121,7 +121,7 @@ LinkCreatPropList::LinkCreatPropList(const hid_t plist_id) : PropList(plist_id)
 void
 LinkCreatPropList::setCreateIntermediateGroup(bool crt_intmd_group) const
 {
-    herr_t ret_value = H5Pset_create_intermediate_group(id, (unsigned)crt_intmd_group);
+    herr_t ret_value = H5Pset_create_intermediate_group(id, static_cast<unsigned>(crt_intmd_group));
     // Throw exception if H5Pset_create_intermediate_group returns failure
     if (ret_value < 0) {
         throw PropListIException("setCreateIntermediateGroup", "H5Pset_create_intermediate_group failed");
@@ -146,7 +146,7 @@ LinkCreatPropList::getCreateIntermediateGroup() const
         throw PropListIException("getCreateIntermediateGroup", "H5Pget_create_intermediate_group failed");
     }
 
-    return ((bool)crt_intmd_group);
+    return static_cast<bool>(crt_intmd_group);
 }
 
 //--------------------------------------------------------------------------

c++/src/H5Location.cpp

@@ -351,7 +351,7 @@ H5Location::getComment(const char *name, size_t buf_size) const
     H5std_string comment;
 
     // Preliminary call to get the comment's length
-    ssize_t comment_len = H5Oget_comment_by_name(getId(), name, NULL, (size_t)0, H5P_DEFAULT);
+    ssize_t comment_len = H5Oget_comment_by_name(getId(), name, NULL, 0, H5P_DEFAULT);
 
     // If H5Oget_comment_by_name returns a negative value, raise an exception
     if (comment_len < 0) {