[master] 4ba2faf Eliminate WSL() usage.
Poul-Henning Kamp
phk at varnish-cache.org
Mon Feb 20 09:25:43 CET 2012
commit 4ba2fafe6fcca34b05732e464b776b1a5ccb6ea6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Feb 20 08:25:27 2012 +0000
Eliminate WSL() usage.
diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index cfe86ec..961cb8d 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -183,8 +183,8 @@ bes_conn_try(const struct sess *sp, struct vbc *vc, const struct vdi_simple *vs)
} else {
vc->vsl_id = s | VSL_BACKENDMARKER;
VTCP_myname(s, abuf1, sizeof abuf1, pbuf1, sizeof pbuf1);
- WSL(sp->req->vsl, SLT_BackendOpen, vc->vsl_id, "%s %s %s ",
- vs->backend->display_name, abuf1, pbuf1);
+ VSLb(sp->req->vsl, SLT_BackendOpen, "%d %s %s %s ",
+ vc->fd, vs->backend->display_name, abuf1, pbuf1);
}
}
@@ -354,12 +354,12 @@ vbe_GetVbe(const struct sess *sp, struct vdi_simple *vs)
return (vc);
}
VSC_C_main->backend_toolate++;
- WSL(sp->wrk->vsl, SLT_BackendClose, vc->vsl_id, "%s",
- bp->display_name);
+ VSLb(sp->req->vsl, SLT_BackendClose, "%d %s toolate",
+ vc->fd, bp->display_name);
/* Checkpoint log to flush all info related to this connection
before the OS reuses the FD */
- VSL_Flush(sp->wrk->vsl, 0);
+ VSL_Flush(sp->req->vsl, 0);
VTCP_close(&vc->fd);
VBE_DropRefConn(bp);
diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index 3f70cb7..5275680 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -55,7 +55,7 @@ VDI_CloseFd(struct worker *wrk, struct vbc **vbp)
bp = vc->backend;
- WSL(vc->vsl, SLT_BackendClose, vc->vsl_id, "%s", bp->display_name);
+ VSLb(vc->vsl, SLT_BackendClose, "%s", bp->display_name);
/* Checkpoint log to flush all info related to this connection
before the OS reuses the FD */
@@ -89,7 +89,7 @@ VDI_RecycleFd(struct worker *wrk, struct vbc **vbp)
bp = vc->backend;
- WSL(vc->vsl, SLT_BackendReuse, vc->vsl_id, "%s", bp->display_name);
+ VSLb(vc->vsl, SLT_BackendReuse, "%s", bp->display_name);
/*
* Flush the shmlog, so that another session reusing this backend
More information about the varnish-commit
mailing list