Fixes for issues #1 and #2 listed in John's email dated Dec 7 2018:

(1) Assertion failure in the vfd_swmr test
(2) Reader error in the vfd swmr concurrent tests
Also fixes for:
(a) Use H5MV_alloc() to allocate space for md_pages_reserved when creating the metadata file in H5F__vfd_swmr_init()
(b) Remove a multi-page (when vfd_swmr_writer is true) from the page buffer in H5MF_xfree()

1 files changed, 11 insertions, 0 deletions

diff --git a/src/H5MF.c b/src/H5MF.c
index f64a27a..9f415db 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -1238,6 +1238,17 @@ HDfprintf(stderr, "%s: After H5FS_sect_add()\n", FUNC);
             node = NULL;
     } /* end else */
 
+    /* Multi-page and VFD SWMR writer: remove from PB if exists there */
+    if(size > f->shared->fs_page_size && f->shared->vfd_swmr_writer) {
+
+        HDassert(f->shared->pb_ptr != NULL);
+        HDassert(H5F_USE_VFD_SWMR(f));
+        HDassert(H5F_PAGED_AGGR(f));
+
+        if(H5PB_remove_entry(f, addr) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "can't remove the page from page buffer")
+    }
+
 done:
     /* Reset the ring in the API context */
     if(orig_ring != H5AC_RING_INV)