allocate FwdState from mem pools

diff --git a/src/enums.h b/src/enums.h
index d42255353fa2c17933d035d255cb8353e9467746..4b54204d8f907186922e3ef95db35609581e3200 100644 (file)
--- a/src/enums.h
+++ b/src/enums.h
@@ -548,6 +548,8 @@ typedef enum {
     MEM_FILEMAP,
     MEM_FQDNCACHE_ENTRY,
     MEM_FQDNCACHE_PENDING,
+    MEM_FWD_STATE,
+    MEM_FWD_SERVER,
     MEM_HASH_LINK,
     MEM_HASH_TABLE,
     MEM_HTTP_REPLY,

diff --git a/src/forward.cc b/src/forward.cc
index 5b879b3b1e0b445d021e6acb437ba5022bb4cdf1..aa1b991b137abe5223dd65f52851dbad4007224e 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: forward.cc,v 1.15 1998/06/29 21:03:01 wessels Exp $
+ * $Id: forward.cc,v 1.16 1998/07/13 21:37:15 wessels Exp $
  *
  * DEBUG: section 17    Request Forwarding
  * AUTHOR: Duane Wessels
@@ -67,7 +67,7 @@ fwdStateFree(FwdState * fwdState)
     while ((s = n)) {
        n = s->next;
        xfree(s->host);
-       xfree(s);
+       memFree(MEM_FWD_SERVER, s);
     }
     fwdState->servers = NULL;
     requestUnlink(fwdState->request);
@@ -221,7 +221,7 @@ fwdStartComplete(peer * p, void *data)
 {
     FwdState *fwdState = data;
     FwdServer *s;
-    s = xcalloc(1, sizeof(*s));
+    s = memAllocate(MEM_FWD_SERVER);
     if (NULL != p) {
        s->host = xstrdup(p->host);
        s->port = p->http_port;
@@ -329,8 +329,8 @@ fwdStart(int fd, StoreEntry * entry, request_t * request)
     default:
        break;
     }
-    fwdState = xcalloc(1, sizeof(FwdState));
-    cbdataAdd(fwdState, MEM_NONE);
+    fwdState = memAllocate(MEM_FWD_STATE);
+    cbdataAdd(fwdState, MEM_FWD_STATE);
     fwdState->entry = entry;
     fwdState->client_fd = fd;
     fwdState->server_fd = -1;

diff --git a/src/mem.cc b/src/mem.cc
index 8ef30c619945fab30460f4cfba5a523cd0a6a438..7682d13bbd91c80a78f1c9a414dc95525a13c1ce 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: mem.cc,v 1.26 1998/07/07 02:54:14 wessels Exp $
+ * $Id: mem.cc,v 1.27 1998/07/13 21:37:16 wessels Exp $
  *
  * DEBUG: section 13    High Level Memory Pool Management
  * AUTHOR: Harvest Derived
@@ -224,6 +224,8 @@ memInit(void)
        sizeof(fqdncache_entry), 0);
     memDataInit(MEM_FQDNCACHE_PENDING, "fqdn_pending",
        sizeof(fqdn_pending), 0);
+    memDataInit(MEM_FWD_STATE, "FwdState", sizeof(FwdState), 0);
+    memDataInit(MEM_FWD_SERVER, "FwdServer", sizeof(FwdServer), 0);
     memDataInit(MEM_HASH_LINK, "hash_link", sizeof(hash_link), 0);
     memDataInit(MEM_HASH_TABLE, "hash_table", sizeof(hash_table), 0);
     memDataInit(MEM_HIERARCHYLOGENTRY, "HierarchyLogEntry",