fix delaypools/delay-pools typo and remove references to HEAP_REPLACEMENT

diff --git a/src/cf_gen_defines b/src/cf_gen_defines
index 1fbab497f2a789e355bdcd19c7d0daf149e55cd9..0dd50f30d656a584ea5218fb57b0caede90b8150 100755 (executable)
--- a/src/cf_gen_defines
+++ b/src/cf_gen_defines
@@ -4,8 +4,7 @@ BEGIN {
        print " * DO NOT EDIT"
        print "*/"
        print "struct { char *name; char *enable; int defined;} defines[] = {"
-       define["DELAY_POOLS"]="--enable-delaypools"
-       define["HEAP_REPLACEMENT"]="--enable-heap-replacement"
+       define["DELAY_POOLS"]="--enable-delay-pools"
        define["HTTP_VIOLATIONS"]="--enable-http-violations"
        define["SQUID_SNMP"]="--enable-snmp"
        define["USE_CACHE_DIGESTS"]="--enable-cache-digests"

diff --git a/src/fs/aufs/store_dir_aufs.cc b/src/fs/aufs/store_dir_aufs.cc
index b43488672164b3e9bfa63d06b7fdf7bf1fc61b8d..a33cd4f79769fc5e1f4dea1e6a45672a85008b87 100644 (file)
--- a/src/fs/aufs/store_dir_aufs.cc
+++ b/src/fs/aufs/store_dir_aufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_aufs.cc,v 1.32 2001/03/03 10:39:37 hno Exp $
+ * $Id: store_dir_aufs.cc,v 1.33 2001/03/14 22:28:37 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -1480,15 +1480,6 @@ storeAufsDirStats(SwapDir * SD, StoreEntry * sentry)
     if (SD->flags.read_only)
        storeAppendPrintf(sentry, " READ-ONLY");
     storeAppendPrintf(sentry, "\n");
-#if OLD_UNUSED_CODE
-#if !HEAP_REPLACEMENT
-    storeAppendPrintf(sentry, "LRU Expiration Age: %6.2f days\n",
-       (double) storeAufsDirExpiredReferenceAge(SD) / 86400.0);
-#else
-    storeAppendPrintf(sentry, "Storage Replacement Threshold:\t%f\n",
-       heap_peepminkey(sd.repl.heap.heap));
-#endif
-#endif /* OLD_UNUSED_CODE */
 }
 
 static struct cache_dir_option options[] =

diff --git a/src/fs/diskd/store_dir_diskd.cc b/src/fs/diskd/store_dir_diskd.cc
index 24bfa71b47276aa25f7a5a20a9d7899163b29ce4..ea8c76f1bef58aeec2a3abc64978611f8c6deacd 100644 (file)
--- a/src/fs/diskd/store_dir_diskd.cc
+++ b/src/fs/diskd/store_dir_diskd.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_diskd.cc,v 1.46 2001/03/04 01:12:13 wessels Exp $
+ * $Id: store_dir_diskd.cc,v 1.47 2001/03/14 22:28:40 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -1700,15 +1700,6 @@ storeDiskdDirStats(SwapDir * SD, StoreEntry * sentry)
     if (SD->flags.read_only)
        storeAppendPrintf(sentry, " READ-ONLY");
     storeAppendPrintf(sentry, "\n");
-#if OLD_UNUSED_CODE
-#if !HEAP_REPLACEMENT
-    storeAppendPrintf(sentry, "LRU Expiration Age: %6.2f days\n",
-       (double) storeDiskdDirExpiredReferenceAge(SD) / 86400.0);
-#else
-    storeAppendPrintf(sentry, "Storage Replacement Threshold:\t%f\n",
-       heap_peepminkey(sd.repl.heap.heap));
-#endif
-#endif /* OLD_UNUSED_CODE */
     storeAppendPrintf(sentry, "Pending operations: %d\n", diskdinfo->away);
 }
 

diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index 6e71dff2db827d6562fb6efe57af84b2d195f0a6..8bc298457c6db5dbc24e1ac98bc5d1b8ac1d3fb1 100644 (file)
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir_ufs.cc,v 1.32 2001/03/04 01:12:16 wessels Exp $
+ * $Id: store_dir_ufs.cc,v 1.33 2001/03/14 22:28:41 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -1354,14 +1354,6 @@ storeUfsDirMaintain(SwapDir * SD)
 int
 storeUfsDirCheckObj(SwapDir * SD, const StoreEntry * e)
 {
-#if OLD_UNUSED_CODE
-    if (storeUfsDirExpiredReferenceAge(SD) < 300) {
-       debug(20, 3) ("storeUfsDirCheckObj: NO: LRU Age = %d\n",
-           storeUfsDirExpiredReferenceAge(SD));
-       /* store_check_cachable_hist.no.lru_age_too_low++; */
-       return -1;
-    }
-#endif
     /* Return 999 (99.9%) constant load */
     return 999;
 }
@@ -1478,15 +1470,6 @@ storeUfsDirStats(SwapDir * SD, StoreEntry * sentry)
     if (SD->flags.read_only)
        storeAppendPrintf(sentry, " READ-ONLY");
     storeAppendPrintf(sentry, "\n");
-#if OLD_UNUSED_CODE
-#if !HEAP_REPLACEMENT
-    storeAppendPrintf(sentry, "LRU Expiration Age: %6.2f days\n",
-       (double) storeUfsDirExpiredReferenceAge(SD) / 86400.0);
-#else
-    storeAppendPrintf(sentry, "Storage Replacement Threshold:\t%f\n",
-       heap_peepminkey(sd.repl.heap.heap));
-#endif
-#endif /* OLD_UNUSED_CODE */
 }
 
 static struct cache_dir_option options[] =

diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc
index 75e4d8588bdc90750b105d5c5f3265f77b44f587..9c02798b16b2d0f975972255a2db964c7ee17152 100644 (file)
--- a/src/repl/heap/store_repl_heap.cc
+++ b/src/repl/heap/store_repl_heap.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_repl_heap.cc,v 1.6 2001/03/03 10:39:39 hno Exp $
+ * $Id: store_repl_heap.cc,v 1.7 2001/03/14 22:28:44 wessels Exp $
  *
  * DEBUG: section ?     HEAP based removal policies
  * AUTHOR: Henrik Nordstrom
@@ -233,11 +233,6 @@ heap_purgeInit(RemovalPolicy * policy, int max_scan)
     walker->max_scan = max_scan;
     walker->Next = heap_purgeNext;
     walker->Done = heap_purgeDone;
-#if HEAP_REPLACEMENT_DEBUG
-    if (!verify_heap_property(heap->heap)) {
-       debug(81, 1) ("Heap property violated!\n");
-    }
-#endif
     return walker;
 }