From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Wed, 2 Aug 2006 10:53:49 +0000 (+0000)
Subject: Simplify backend connection memory management.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6774285f2446bc1b00e16b64396bf927eb10bb51;p=varnish

Simplify backend connection memory management.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@599 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 128178c8..1c9c8b80 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -121,7 +121,6 @@ struct vbe_conn {
 	unsigned		magic;
 #define VBE_CONN_MAGIC		0x0c5e6592
 	TAILQ_ENTRY(vbe_conn)	list;
-	struct vbc_mem		*vbcm;
 	struct vbe		*vbe;
 	int			fd;
 	struct event		ev;
diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c
index a9d158d6..e5a040d5 100644
--- a/varnish-cache/bin/varnishd/cache_backend.c
+++ b/varnish-cache/bin/varnishd/cache_backend.c
@@ -39,12 +39,6 @@
 #include "shmlog.h"
 #include "cache.h"
 
-struct vbc_mem {
-	unsigned		magic;
-#define VBC_MEM_MAGIC		0x2fd7af01
-	struct vbe_conn		vbc;
-};
-
 /* A backend IP */
 
 struct vbe {
@@ -70,21 +64,17 @@ static int vbe_pipe[2];
 static struct vbe_conn *
 vbe_new_conn(void)
 {
-	struct vbc_mem *vbcm;
 	struct vbe_conn *vbc;
 	unsigned char *p;
 
-	vbcm = calloc(sizeof *vbcm + heritage.mem_workspace * 2, 1);
-	if (vbcm == NULL)
+	vbc = calloc(sizeof *vbc + heritage.mem_workspace * 2, 1);
+	if (vbc == NULL)
 		return (NULL);
-	vbcm->magic = VBC_MEM_MAGIC;
 	VSL_stats->n_vbe_conn++;
-	vbc = &vbcm->vbc;
 	vbc->magic = VBE_CONN_MAGIC;
-	vbc->vbcm = vbcm;
 	vbc->http = &vbc->http_mem[0];
 	vbc->http2 = &vbc->http_mem[1];
-	p = (void *)(vbcm + 1);
+	p = (void *)(vbc + 1);
 	http_Setup(vbc->http, p, heritage.mem_workspace);
 	p += heritage.mem_workspace;
 	http_Setup(vbc->http2, p, heritage.mem_workspace);
@@ -96,9 +86,8 @@ vbe_delete_conn(struct vbe_conn *vb)
 {
 
 	CHECK_OBJ_NOTNULL(vb, VBE_CONN_MAGIC);
-	CHECK_OBJ_NOTNULL(vb->vbcm, VBC_MEM_MAGIC);
 	VSL_stats->n_vbe_conn--;
-	free(vb->vbcm);
+	free(vb);
 }
 
 /*--------------------------------------------------------------------*/