Merge pull request #416 from derobins/vfd_swmr/thg_standards

Brings VFD SWMR code closer to THG standards and allows C library compilation on Windows

MANIFEST

@@ -185,6 +185,13 @@
 
 ./config/site-specific/BlankForm
 
+./doc/SWMR_Example.png
+./doc/SWMRdataflow.png
+./doc/VFD_SWMR_Punch_List.md
+./doc/VFD_SWMR_RFC_200916.docx
+./doc/VFD_SWMR_RFC_200916.pdf
+./doc/VFD_SWMR_RFC_2020-02-03.docx
+./doc/vfd-swmr-user-guide.md
 ./doc/code-conventions.md
 
 ./examples/Attributes.txt
@@ -521,8 +528,6 @@
 ./src/hdf5.lnt        _DO_NOT_DISTRIBUTE_
 ./src/hdf5-win.lnt      _DO_NOT_DISTRIBUTE_
 ./src/hdf5-lin.lnt      _DO_NOT_DISTRIBUTE_
-./src/hlog.c
-./src/hlog.h
 ./src/COPYING
 ./src/H5.c
 ./src/H5checksum.c
@@ -667,6 +672,7 @@
 ./src/H5Fprivate.h
 ./src/H5Fpublic.h
 ./src/H5Ftest.c
+./src/H5Fvfd_swmr.c
 ./src/H5FA.c
 ./src/H5FAcache.c
 ./src/H5FAdbg.c
@@ -716,6 +722,8 @@
 ./src/H5FDstdio.c
 ./src/H5FDstdio.h
 ./src/H5FDtest.c
+./src/H5FDvfd_swmr_instr.c
+./src/H5FDvfd_swmr_private.h
 ./src/H5FDvfd_swmr.c
 ./src/H5FDvfd_swmr.h
 ./src/H5FDwindows.c
@@ -783,6 +791,7 @@
 ./src/H5HGpkg.h
 ./src/H5HGprivate.h
 ./src/H5HGquery.c
+./src/H5HGtrap.c
 ./src/H5HL.c
 ./src/H5HLcache.c
 ./src/H5HLdbg.c
@@ -1020,10 +1029,13 @@
 ./src/H5Zshuffle.c
 ./src/H5Zszip.c
 ./src/H5Ztrans.c
+./src/H5queue.h
+./src/H5retry_private.h
+./src/H5time_private.h
+./src/H5win32defs.h
 ./src/Makefile.am
 ./src/hdf5.h
 ./src/libhdf5.settings.in
-./src/H5win32defs.h
 
 ./test/AtomicWriterReader.txt
 ./test/COPYING
@@ -1188,6 +1200,8 @@
 # ====end distribute this for now. See HDFFV-8236====
 ./test/specmetaread.h5
 ./test/stab.c
+./test/stubs.c
+./test/supervise.subr
 ./test/swmr.c
 ./test/swmr_addrem_writer.c
 ./test/swmr_check_compat_vfd.c
@@ -1285,8 +1299,18 @@
 ./test/vfd_swmr_common.c
 ./test/vfd_swmr_common.h
 ./test/vfd_swmr_generator.c
+./test/vfd_swmr_addrem_writer.c
+./test/vfd_swmr_bigset_writer.c
+./test/vfd_swmr_group_writer.c
 ./test/vfd_swmr_reader.c
+./test/vfd_swmr_remove_reader.c
+./test/vfd_swmr_remove_writer.c
+./test/vfd_swmr_sparse_reader.c
+./test/vfd_swmr_sparse_writer.c
+./test/vfd_swmr_vlstr_reader.c
+./test/vfd_swmr_vlstr_writer.c
 ./test/vfd_swmr_writer.c
+./test/vfd_swmr_zoo_writer.c
 ./test/vfd.c
 ./test/vol.c
 ./test/vol_plugin.c

config/cmake/H5pubconf.h.in

@@ -222,6 +222,9 @@
 /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
 #cmakedefine H5_HAVE_LIBDMALLOC @H5_HAVE_LIBDMALLOC@
 
+/* Define to 1 if you have the <libgen.h> header file. */
+#cmakedefine H5_HAVE_LIBGEN_H @H5_HAVE_LIBGEN_H@
+
 /* Proceed to build with libhdfs */
 #cmakedefine H5_HAVE_LIBHDFS @H5_HAVE_LIBHDFS@
 

config/cmake_ext_mod/ConfigureChecks.cmake

@@ -136,6 +136,7 @@ CHECK_INCLUDE_FILE_CONCAT ("setjmp.h"        ${HDF_PREFIX}_HAVE_SETJMP_H)
 CHECK_INCLUDE_FILE_CONCAT ("stddef.h"        ${HDF_PREFIX}_HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE_CONCAT ("stdint.h"        ${HDF_PREFIX}_HAVE_STDINT_H)
 CHECK_INCLUDE_FILE_CONCAT ("unistd.h"        ${HDF_PREFIX}_HAVE_UNISTD_H)
+CHECK_INCLUDE_FILE_CONCAT ("libgen.h"        ${HDF_PREFIX}_HAVE_LIBGEN_H)
 
 # Windows
 CHECK_INCLUDE_FILE_CONCAT ("io.h"            ${HDF_PREFIX}_HAVE_IO_H)

configure.ac

@@ -1144,7 +1144,7 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS([sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h])
 AC_CHECK_HEADERS([sys/socket.h sys/types.h sys/file.h])
 AC_CHECK_HEADERS([stddef.h setjmp.h features.h])
-AC_CHECK_HEADERS([dirent.h])
+AC_CHECK_HEADERS([dirent.h libgen.h])
 AC_CHECK_HEADERS([stdint.h], [C9x=yes])
 AC_CHECK_HEADERS([stdbool.h])
 AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h])

src/CMakeLists.txt

@@ -12,7 +12,6 @@ set (H5_SOURCES
     ${HDF5_SRC_DIR}/H5system.c
     ${HDF5_SRC_DIR}/H5timer.c
     ${HDF5_SRC_DIR}/H5trace.c
-    ${HDF5_SRC_DIR}/hlog.c
 )
 
 set (H5_HDRS
@@ -816,7 +815,8 @@ set (H5_PUBLIC_HEADERS
 
 set (H5_PRIVATE_HEADERS
     ${HDF5_SRC_DIR}/H5private.h
-    ${HDF5_SRC_DIR}/hlog.h
+    ${HDF5_SRC_DIR}/H5queue.h
+    ${HDF5_SRC_DIR}/H5retry_private.h
 
     ${HDF5_SRC_DIR}/H5Apkg.h
     ${HDF5_SRC_DIR}/H5Aprivate.h

src/H5C.c

@@ -1325,13 +1325,7 @@ H5C_evict_or_refresh_all_entries_in_page(H5F_t * f, uint64_t page,
         entry_ptr = entry_ptr->pi_next;
     }
 
-    if (!found) {
-        hlog_fast(mdc_invalidation, "no MDC match for page %" PRIu64
-            " length %" PRIu32 " tick %" PRIu64, page, length, tick);
-    }
-
 done:
-
     FUNC_LEAVE_NOAPI(ret_value)
 
 } /* H5C_evict_or_refresh_all_entries_in_page() */