Revert "Fix some more signed -> unsigned value issues with cache data structures, also"

This reverts commit 4b5e05c084f93c35dae946c2c9e814d565a613b0.

1 files changed, 72 insertions, 26 deletions

diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c
index 7df8093..137e21d 100644
--- a/src/H5Cmpio.c
+++ b/src/H5Cmpio.c
@@ -164,13 +164,38 @@ static herr_t H5C__collective_write(H5F_t *f, hid_t dxpl_id);
  * Programmer:  John Mainzer
  *              3/17/10
  *
+ * Changes:     Ported code to detect next entry status changes as the 
+ *              the result of a flush from the serial code in the scan of 
+ *              the LRU.  Also added code to detect and adapt to the 
+ *              removal from the cache of the next entry in the scan of 
+ *		the LRU.
+ *
+ *		Note that at present, all of these changes should not 
+ *		be required as the operations on entries as they are 
+ *		flushed that can cause these condiditions are not premitted
+ *		in the parallel case.  However, Quincey indicates that 
+ *		this may change, and thus has requested the modification.
+ *
+ *		Note the assert(FALSE) in the if statement whose body 
+ *		restarts the scan of the LRU.  As the body of the if 
+ *		statement should be unreachable, it should never be 
+ *		triggered until the constraints on the parallel case 
+ *		are relaxed.  Please remove the assertion at that time.
+ *
+ *		Also added warning on the Pinned Entry List scan, as it
+ *		is potentially subject to the same issue.  As there is 
+ *		no cognate of this scan in the serial code, I don't have
+ *		a fix to port to it.
+ *
+ *						JRM -- 4/10/19
+ *		
  *-------------------------------------------------------------------------
  */
 herr_t
 H5C_apply_candidate_list(H5F_t * f,
                          hid_t dxpl_id,
                          H5C_t * cache_ptr,
-                         unsigned num_candidates,
+                         int num_candidates,
                          haddr_t * candidates_list_ptr,
                          int mpi_rank,
                          int mpi_size)
@@ -206,8 +231,7 @@ H5C_apply_candidate_list(H5F_t * f,
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
     char		tbl_buf[1024];
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
-    unsigned            u;                      /* Local index variable */
-    herr_t              ret_value = SUCCEED;    /* Return value */
+    herr_t              ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -226,8 +250,8 @@ H5C_apply_candidate_list(H5F_t * f,
     HDmemset(tbl_buf, 0, sizeof(tbl_buf));
 
     sprintf(&(tbl_buf[0]), "candidate list = ");
-    for(u = 0; u < num_candidates; u++)
-        sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " 0x%llx", (long long)(*(candidates_list_ptr + u)));
+    for(i = 0; i < num_candidates; i++)
+        sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), " 0x%llx", (long long)(*(candidates_list_ptr + i)));
     sprintf(&(tbl_buf[HDstrlen(tbl_buf)]), "\n");
 
     HDfprintf(stdout, "%s", tbl_buf);
@@ -303,12 +327,12 @@ H5C_apply_candidate_list(H5F_t * f,
     HDfprintf(stdout, "%s:%d: marking entries.\n", FUNC, mpi_rank);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
-    for(u = 0; u < num_candidates; u++) {
-        addr = candidates_list_ptr[u];
+    for(i = 0; i < num_candidates; i++) {
+        addr = candidates_list_ptr[i];
         HDassert(H5F_addr_defined(addr));
 
 #if H5C_DO_SANITY_CHECKS
-        if(u > 0) {
+        if(i > 0) {
             if(last_addr == addr)
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "duplicate entry in cleaned list")
             else if(last_addr > addr)
@@ -328,7 +352,7 @@ H5C_apply_candidate_list(H5F_t * f,
              * If we encounter one, scream and die.  If it becomes an
              * issue, we should be able to work around this. 
              */
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry is protected?!?!?")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Listed entry is protected?!?!?.")
             /* Determine whether the entry is to be cleared or flushed,
              * and mark it accordingly.  We will scan the protected and 
              * pinned list shortly, and clear or flush according to these
@@ -343,21 +367,20 @@ H5C_apply_candidate_list(H5F_t * f,
                 entry_ptr->clear_on_unprotect = TRUE;
             } /* end else */
 
-        /* Entries marked as collectively accessed and are in the
-         * candidate list to clear from the cache have to be
-         * removed from the coll list. This is OK since the
-         * candidate list is collective and uniform across all
-         * ranks. 
-         */
-        if(entry_ptr->coll_access) {
-            entry_ptr->coll_access = FALSE;
-            H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL)
-        } /* end if */
+            /* Entries marked as collectively accessed and are in the
+               candidate list to clear from the cache have to be
+               removed from the coll list. This is OK since the
+               candidate list is collective and uniform across all
+               ranks. */
+            if(entry_ptr->coll_access) {
+                entry_ptr->coll_access = FALSE;
+                H5C__REMOVE_FROM_COLL_LIST(cache_ptr, entry_ptr, FAIL)
+            } /* end if */
     } /* end for */
 
 #if H5C_APPLY_CANDIDATE_LIST__DEBUG
-    HDfprintf(stdout, "%s:%d: num candidates/to clear/to flush = %u/%d/%d.\n", 
-              FUNC, mpi_rank, num_candidates, (int)entries_to_clear,
+    HDfprintf(stdout, "%s:%d: num candidates/to clear/to flush = %d/%d/%d.\n", 
+              FUNC, mpi_rank, (int)num_candidates, (int)entries_to_clear,
               (int)entries_to_flush);
 #endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
 
@@ -806,7 +829,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
 
     if(space_needed > 0) { /* we have work to do */
         H5C_cache_entry_t *entry_ptr;
-        unsigned nominated_entries_count = 0;
+        int     nominated_entries_count = 0;
         size_t  nominated_entries_size = 0;
         haddr_t	nominated_addr;
 
@@ -920,7 +943,7 @@ H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
 
     if(space_needed > 0) { /* we have work to do */
         H5C_cache_entry_t *entry_ptr;
-        unsigned nominated_entries_count = 0;
+        int    nominated_entries_count = 0;
         size_t nominated_entries_size = 0;
 
         HDassert( cache_ptr->slist_len > 0 );
@@ -987,6 +1010,29 @@ done:
  * Programmer:  John Mainzer
  *              7/5/05
  *
+ * Changes:     Tidied up code, removeing some old commented out 
+ *		code that had been left in pending success of the 
+ *		new version.
+ *
+ *		Note that unlike H5C_apply_candidate_list(), 
+ *		H5C_mark_entries_as_clean() makes all its calls to 
+ *		H5C__flush_single_entry() with the 
+ *		H5C__FLUSH_CLEAR_ONLY_FLAG set.  As a result, 
+ *		the pre_serialize() and serialize calls are not made.
+ *
+ *		This then implies that (assuming such actions were 
+ *		permitted in the parallel case) no loads, dirties, 
+ *		resizes, or removals of other entries can occur as 
+ *		a side effect of the flush.  Hence, there is no need
+ *		for the checks for entry removal / status change 
+ *		that I ported to H5C_apply_candidate_list().
+ *
+ *		However, if (in addition to allowing such operations
+ *		in the parallel case), we allow such operations outside
+ *		of the pre_serialize / serialize routines, this may 
+ *		cease to be the case -- requiring a review of this 
+ *		function.
+ *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -997,9 +1043,9 @@ H5C_mark_entries_as_clean(H5F_t *  f,
 {
     H5C_t *             cache_ptr;
     int			entries_cleared;
-    unsigned		entries_examined;
+    int			entries_examined;
     int                 i;
-    unsigned		initial_list_len;
+    int			initial_list_len;
     haddr_t		addr;
 #if H5C_DO_SANITY_CHECKS
     int			pinned_entries_marked = 0;
@@ -1220,7 +1266,7 @@ done:
 herr_t
 H5C_clear_coll_entries(H5C_t *cache_ptr, hbool_t partial)
 { 
-    uint32_t		clear_cnt;
+    int32_t		clear_cnt;
     H5C_cache_entry_t *	entry_ptr = NULL;
     herr_t              ret_value = SUCCEED;