From: wessels <>
Date: Thu, 29 Aug 1996 22:54:03 +0000 (+0000)
Subject: call storePurgeMem() instead of storeRelease in storeGetMemSpace!
X-Git-Tag: SQUID_3_0_PRE1~5884
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66c2848f5917fbe32f9176d6c16e7828b57e574a;p=thirdparty%2Fsquid.git

call storePurgeMem() instead of storeRelease in storeGetMemSpace!
---

diff --git a/src/store.cc b/src/store.cc
index 9b523ede88..0ea586581c 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: store.cc,v 1.90 1996/08/28 20:11:07 wessels Exp $
+ * $Id: store.cc,v 1.91 1996/08/29 16:54:03 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -1886,7 +1886,7 @@ int storeGetMemSpace(size, check_vm_number)
     StoreEntry **list = NULL;
     int list_count = 0;
     int n_expired = 0;
-    int n_released = 0;
+    int n_purged = 0;
     int n_locked = 0;
     int i;
     static time_t last_warning = 0;
@@ -1933,24 +1933,24 @@ int storeGetMemSpace(size, check_vm_number)
     /* Kick LRU out until we have enough memory space */
     for (i = 0; i < list_count; i++) {
 	if (meta_data.hot_vm > store_hotobj_low) {
-	    storeRelease(*(list + i));
-	    n_released++;
+	    storePurgeMem(*(list + i));
+	    n_purged++;
 	} else if ((store_mem_size + size) > store_mem_low) {
-	    storeRelease(*(list + i));
-	    n_released++;
+	    storePurgeMem(*(list + i));
+	    n_purged++;
 	} else
 	    break;
     }
 
     debug(20, 2, "storeGetMemSpace: After freeing size: %7d bytes\n", store_mem_size);
-    debug(20, 2, "storeGetMemSpace: Released:           %7d items\n", n_released);
+    debug(20, 2, "storeGetMemSpace: Purged:             %7d items\n", n_purged);
     if (meta_data.hot_vm > store_hotobj_high) {
 	if (squid_curtime - last_warning > 600) {
 	    debug(20, 0, "WARNING: Over hot_vm object count (%d > %d)\n",
 		meta_data.hot_vm, store_hotobj_high);
 	    debug(20, 0, "       : %d objects locked in memory\n", n_locked);
-	    debug(20, 0, "       : released %d of %d candidates\n",
-		n_released,
+	    debug(20, 0, "       : purged %d of %d candidates\n",
+		n_purged,
 		list_count);
 	    last_warning = squid_curtime;
 	}
@@ -1960,7 +1960,7 @@ int storeGetMemSpace(size, check_vm_number)
 		store_mem_size + size, store_mem_high);
 	    debug(20, 0, "       : %d objects locked in memory\n", n_locked);
 	    debug(20, 0, "       : released %d of %d candidates\n",
-		n_released,
+		n_purged,
 		list_count);
 	    last_warning = squid_curtime;
 	}