DW:

 - key --> hash.key changes

diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc
index e04d459e816607029cc17028d2a438f9d233f2c8..296b61e4974a1aa3595c6f12264e07ed96203082 100644 (file)
--- a/src/repl/heap/store_heap_replacement.cc
+++ b/src/repl/heap/store_heap_replacement.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_heap_replacement.cc,v 1.1 2000/06/08 18:05:40 hno Exp $
+ * $Id: store_heap_replacement.cc,v 1.2 2000/11/03 16:38:46 wessels Exp $
  *
  * DEBUG: section 20    Storage Manager Heap-based replacement
  * AUTHOR: John Dilley
@@ -77,7 +77,7 @@ heap_key HeapKeyGen_StoreEntry_LFUDA(void *entry, double age)
        tie = 1.0 - exp((double) (e->lastref - squid_curtime) / 86400.0);
     key = age + (double) e->refcount - tie;
     debug(81, 3) ("HeapKeyGen_StoreEntry_LFUDA: %s refcnt=%ld lastref=%ld age=%f tie=%f -> %f\n",
-           storeKeyText(e->key), e->refcount, e->lastref, age, tie, key);
+           storeKeyText(e->hash.key), e->refcount, e->lastref, age, tie, key);
     if (e->mem_obj && e->mem_obj->url)
        debug(81, 3) ("HeapKeyGen_StoreEntry_LFUDA: url=%s\n",
            e->mem_obj->url);
@@ -112,7 +112,7 @@ heap_key HeapKeyGen_StoreEntry_GDSF(void *entry, double age)
     double tie = (e->lastref > 1) ? (1.0 / e->lastref) : 1.0;
     key = age + ((double) e->refcount / size) - tie;
     debug(81, 3) ("HeapKeyGen_StoreEntry_GDSF: %s size=%f refcnt=%ld lastref=%ld age=%f tie=%f -> %f\n",
-           storeKeyText(e->key), size, e->refcount, e->lastref, age, tie, key);
+           storeKeyText(e->hash.key), size, e->refcount, e->lastref, age, tie, key);
     if (e->mem_obj && e->mem_obj->url)
        debug(81, 3) ("HeapKeyGen_StoreEntry_GDSF: url=%s\n",
            e->mem_obj->url);
@@ -130,7 +130,7 @@ heap_key HeapKeyGen_StoreEntry_LRU(void *entry, double age)
 {
     StoreEntry *e = entry;
     debug(81, 3) ("HeapKeyGen_StoreEntry_LRU: %s age=%f lastref=%f\n",
-           storeKeyText(e->key), age, (double)e->lastref);
+           storeKeyText(e->hash.key), age, (double)e->lastref);
     if (e->mem_obj && e->mem_obj->url)
        debug(81, 3) ("HeapKeyGen_StoreEntry_LRU: url=%s\n",
            e->mem_obj->url);