Tidied up comments and removed some stats code that is un-reachable.

4 files changed, 29 insertions, 33 deletions

diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index 1ada162..4132f3b 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -1108,8 +1108,8 @@ H5F__cache_drvrinfo_free_icr(void *_thing)
  *              is created, for the most part, this function simply 
  *              verifies the expected values.
  *
- * Return:	Success:	Pointer to new object
- *		Failure:	NULL
+ * Return:	Success:	SUCCEED
+ *		Failure:	FAIL
  *
  * Programmer:	John Mainzer
  *		12/21/19
@@ -1303,7 +1303,9 @@ H5F__cache_superblock_refresh(H5F_t *f, void * _thing, const void * _image,
         if ( status_flags != sblock->status_flags )
             HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "unexpected status_flags")
 
-	/* Base, superblock extension, end of file & root group object header addresses */
+	/* Base, superblock extension, end of file & root group object 
+         * header addresses 
+         */
 	H5F_addr_decode(f, (const uint8_t **)&image, &base_addr/*out*/);
 	H5F_addr_decode(f, (const uint8_t **)&image, &ext_addr/*out*/);
 	H5F_addr_decode(f, (const uint8_t **)&image, &stored_eof/*out*/);
diff --git a/src/H5PB.c b/src/H5PB.c
index b6db93a..3676bd7 100644
--- a/src/H5PB.c
+++ b/src/H5PB.c
@@ -197,7 +197,6 @@ H5PB_reset_stats(H5PB_t *pb_ptr)
     pb_ptr->max_md_pages                     = 0;
     pb_ptr->max_mpmde_count                  = 0;
     pb_ptr->lru_tl_skips                     = 0;
-    pb_ptr->lru_dwl_skips                    = 0;
     pb_ptr->max_tl_len                       = 0;
     pb_ptr->max_tl_size                      = 0;
     pb_ptr->delayed_writes                   = 0;
@@ -217,12 +216,23 @@ H5PB_reset_stats(H5PB_t *pb_ptr)
  * Purpose:     This function was created without documentation.
  *              What follows is my best understanding of Mohamad's intent.
  *
- *              Retrieve statistics collected about page accesses for the page buffer layer.
- *              --accesses: the number of metadata and raw data accesses to the page buffer layer
- *              --hits: the number of metadata and raw data hits in the page buffer layer
- *              --misses: the number of metadata and raw data misses in the page buffer layer
- *              --evictions: the number of metadata and raw data evictions from the page buffer layer
- *              --bypasses: the number of metadata and raw data accesses that bypass the page buffer layer
+ *              Retrieve statistics collected about page accesses for the 
+ *              page buffer layer.
+ *
+ *              --accesses: the number of metadata and raw data accesses 
+ *                          to the page buffer layer
+ *
+ *              --hits: the number of metadata and raw data hits in 
+ *                          the page buffer layer
+ *
+ *              --misses: the number of metadata and raw data misses in 
+ *                          the page buffer layer
+ *
+ *              --evictions: the number of metadata and raw data evictions 
+ *                          from the page buffer layer
+ *
+ *              --bypasses: the number of metadata and raw data accesses 
+ *                          that bypass the page buffer layer
  *
  * Return:	    Non-negative on success/Negative on failure
  *
@@ -331,9 +341,9 @@ H5PB_print_stats(const H5PB_t *pb_ptr)
               pb_ptr->max_lru_len, pb_ptr->max_lru_size);
 
     HDfprintf(stdout, 
-              "LRU make space md/rd/tl/dwl skips = %lld/%lld/%lld/%lld\n",
+              "LRU make space md/rd/tl skips = %lld/%lld/%lld\n",
               pb_ptr->lru_md_skips, pb_ptr->lru_rd_skips, 
-              pb_ptr->lru_tl_skips, pb_ptr->lru_dwl_skips);
+              pb_ptr->lru_tl_skips);
 
     HDfprintf(stdout, "hash table insertions / deletions = %lld / %lld\n",
               pb_ptr->total_ht_insertions, pb_ptr->total_ht_deletions);
diff --git a/src/H5PBpkg.h b/src/H5PBpkg.h
index fd4b21c..88b0685 100644
--- a/src/H5PBpkg.h
+++ b/src/H5PBpkg.h
@@ -49,9 +49,9 @@
  * We maintain doubly linked lists of instances of H5PB_entry_t for a
  * variety of reasons -- LRU list, tick list, and the delayed write list
  * at present.  The following macros support linking and unlinking
- * of instances of H5PB_entry_t by both their regular and tick list next
- * and previous pointers.  Note that the tick list is only used in the 
- * context of VFD SWMR
+ * instances of H5PB_entry_t by both their regular and tick list next
+ * and previous pointers.  Note that the tick list and the delayed write
+ * list are only used in the context of VFD SWMR
  *
  * The size and length fields are also maintained.
  *
@@ -641,12 +641,6 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
     ((pb_ptr)->lru_tl_skips)++;                    \
 }
 
-#define H5PB__UPDATE_STATS_FOR_LRU_DWL_SKIP(pb_ptr) \
-{                                                   \
-    HDassert((pb_ptr)->vfd_swmr_writer);            \
-    ((pb_ptr)->lru_dwl_skips)++;                    \
-}
-
 #define H5PB__UPDATE_TL_SIZE_STATS(pb_ptr)           \
 {                                                    \
     HDassert((pb_ptr)->vfd_swmr_writer);             \
diff --git a/src/H5PBprivate.h b/src/H5PBprivate.h
index 201a298..d1b6510 100644
--- a/src/H5PBprivate.h
+++ b/src/H5PBprivate.h
@@ -199,7 +199,6 @@ typedef struct H5PB_entry_t H5PB_entry_t;
  *              linked by their il_next and il_prev fields.
  *
  *              This field is NULL if the index is empty.
-
  *
  *
  * Fields supporting the modified LRU policy:
@@ -288,7 +287,7 @@ typedef struct H5PB_entry_t H5PB_entry_t;
  *
  * vfd_swmr_writer: Boolean flag that is set to TRUE iff the file is 
  *              the file is opened in VFD SWMR mode.  The remaining 
- *              VFD SWMR flags are defined iff vfd_swmr_writer is TRUE.
+ *              VFD SWMR fields are defined iff vfd_swmr_writer is TRUE.
  *
  * mpmde_count: int64_t containing the number of multi-page metadata 
  *              entries currently resident in the page buffer.  Observe 
@@ -385,7 +384,7 @@ typedef struct H5PB_entry_t H5PB_entry_t;
  * bypasses:    Array of int64_t of length H5PB__NUM_STAT_TYPES containing
  *              the number of times that the page buffer has been 
  *              bypassed for raw data, metadata, and for multi-page 
- *               metadata entries (VFD SWMR only) as indexed by 5PB__STATS_MD, 
+ *              metadata entries (VFD SWMR only) as indexed by 5PB__STATS_MD, 
  *              H5PB__STATS_RD, and H5PB__STATS_MPMDE respectively.
  *
  * accesses:    Array of int64_t of length H5PB__NUM_STAT_TYPES containing 
@@ -513,14 +512,6 @@ typedef struct H5PB_entry_t H5PB_entry_t;
  *              If this number becomes excessive, it will be necessary to 
  *              add a holding tank for such entries.
  *
- * lru_dwl_skips: When searching for an entry to evict, metadata entries on 
- *              the LRU must be skipped if they also reside on the tick list.
- *
- *              This int64_t is used to keep a count of these skips.
- *
- *              If this number becomes excessive, it will be necessary to 
- *              add a holding tank for such entries.
- *
  * max_tl_len:  int64_t containing the maximum value of tl_len.
  *
  * max_tl_size: int64_t containing the maximum value of tl_size.
@@ -647,7 +638,6 @@ typedef struct H5PB_t {
     /* vfd swmr statistics */
     int64_t max_mpmde_count;
     int64_t lru_tl_skips;
-    int64_t lru_dwl_skips;
     int64_t max_tl_len;
     int64_t max_tl_size;
     int64_t delayed_writes;