r599 - trunk/varnish-cache/bin/varnishd
phk at projects.linpro.no
phk at projects.linpro.no
Wed Aug 2 12:53:50 CEST 2006
Author: phk
Date: 2006-08-02 12:53:49 +0200 (Wed, 02 Aug 2006)
New Revision: 599
Modified:
trunk/varnish-cache/bin/varnishd/cache.h
trunk/varnish-cache/bin/varnishd/cache_backend.c
Log:
Simplify backend connection memory management.
Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h 2006-08-02 10:40:22 UTC (rev 598)
+++ trunk/varnish-cache/bin/varnishd/cache.h 2006-08-02 10:53:49 UTC (rev 599)
@@ -121,7 +121,6 @@
unsigned magic;
#define VBE_CONN_MAGIC 0x0c5e6592
TAILQ_ENTRY(vbe_conn) list;
- struct vbc_mem *vbcm;
struct vbe *vbe;
int fd;
struct event ev;
Modified: trunk/varnish-cache/bin/varnishd/cache_backend.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_backend.c 2006-08-02 10:40:22 UTC (rev 598)
+++ trunk/varnish-cache/bin/varnishd/cache_backend.c 2006-08-02 10:53:49 UTC (rev 599)
@@ -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 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 @@
{
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);
}
/*--------------------------------------------------------------------*/
More information about the varnish-commit
mailing list