Skip to content

V
varnish-cache
Commit 086fd762 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Minor simplification

parent f8be8b03
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 21 deletions
bin/varnishd/cache/cache_backend.c
View file @ 086fd762
...@@ -202,24 +202,6 @@ vbe_CheckFd(int fd) ...@@ -202,24 +202,6 @@ vbe_CheckFd(int fd)
return(poll(&pfd, 1, 0) == 0); return(poll(&pfd, 1, 0) == 0);
} }
/*--------------------------------------------------------------------
* Manage a pool of vbc structures.
* XXX: as an experiment, make this caching controlled by a parameter
* XXX: so we can see if it has any effect.
*/
static struct vbc *
vbe_NewConn(void)
{
struct vbc *vc;
vc = MPL_Get(vbcpool, NULL);
XXXAN(vc);
vc->magic = VBC_MAGIC;
vc->fd = -1;
return (vc);
}
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* Test if backend is healthy and report when it last changed * Test if backend is healthy and report when it last changed
*/ */
...@@ -301,9 +283,10 @@ vbe_GetVbe(struct busyobj *bo, struct vbe_dir *vs) ...@@ -301,9 +283,10 @@ vbe_GetVbe(struct busyobj *bo, struct vbe_dir *vs)
return (NULL); return (NULL);
} }
vc = vbe_NewConn(); vc = MPL_Get(vbcpool, NULL);
assert(vc->fd == -1); XXXAN(vc);
AZ(vc->backend); vc->magic = VBC_MAGIC;
vc->fd = -1;
bes_conn_try(bo, vc, vs); bes_conn_try(bo, vc, vs);
if (vc->fd < 0) { if (vc->fd < 0) {
VBE_ReleaseConn(vc); VBE_ReleaseConn(vc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment