Mailing List Archive

Author: phk
Date: 2006-09-15 18:10:15 +0200 (Fri, 15 Sep 2006)
New Revision: 994

Modified:
trunk/varnish-cache/bin/varnishd/cache_center.c
trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
trunk/varnish-cache/include/shmlog_tags.h
Log:
Remove the SessionReuse shmem tag, we have little or no benefit from
knowing this at the end of a request.

Instead put the address + port in the ReqStart shmtag where it does
a lot of good.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c 2006-09-15 10:30:27 UTC (rev 993)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c 2006-09-15 16:10:15 UTC (rev 994)
@@ -163,19 +163,16 @@

if (http_RecvPrepAgain(sp->http)) {
VSL_stats->sess_pipeline++;
- VSL(SLT_SessionReuse, sp->fd, "%s %s", sp->addr, sp->port);
sp->step = STP_RECV;
return (0);
}
if (sp->http->t < sp->http->v) {
VSL_stats->sess_readahead++;
- VSL(SLT_SessionReuse, sp->fd, "%s %s", sp->addr, sp->port);
sp->step = STP_AGAIN;
return (0);
}
if (params->session_grace == 0) {
VSL_stats->sess_herd++;
- VSL(SLT_SessionReuse, sp->fd, "%s %s", sp->addr, sp->port);
sp->wrk->idle = sp->t_open.tv_sec;
vca_return_session(sp);
return (1);
@@ -189,11 +186,9 @@
vca_close_session(sp, "EOF");
} else if (i == 1 && (fds[0].revents & POLLIN)) {
VSL_stats->sess_ready++;
- VSL(SLT_SessionReuse, sp->fd, "%s %s", sp->addr, sp->port);
sp->step = STP_AGAIN;
return (0);
} else {
- VSL(SLT_SessionReuse, sp->fd, "%s %s", sp->addr, sp->port);
VSL_stats->sess_herd++;
}
sp->wrk->idle = sp->t_open.tv_sec;
@@ -677,7 +672,7 @@
clock_gettime(CLOCK_REALTIME, &sp->t_req);
sp->wrk->idle = sp->t_req.tv_sec;
sp->xid = ++xids;
- VSL(SLT_ReqStart, sp->fd, "XID %u", sp->xid);
+ VSL(SLT_ReqStart, sp->fd, "%s %s %u", sp->addr, sp->port, sp->xid);

AZ(sp->vcl);
sp->vcl = VCL_Get();

Modified: trunk/varnish-cache/bin/varnishncsa/varnishncsa.c
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-09-15 10:30:27 UTC (rev 993)
+++ trunk/varnish-cache/bin/varnishncsa/varnishncsa.c 2006-09-15 16:10:15 UTC (rev 994)
@@ -78,13 +78,10 @@
switch (tag) {

case SLT_SessionOpen:
- case SLT_SessionReuse:
+ case SLT_ReqStart:
for (p = ptr, q = lp->df_h; *p && *p != ' ';)
*q++ = *p++;
*q = '\0';
- break;
-
- case SLT_ReqStart:
vsb_clear(lp->sb);
break;


Modified: trunk/varnish-cache/include/shmlog_tags.h
===================================================================
--- trunk/varnish-cache/include/shmlog_tags.h 2006-09-15 10:30:27 UTC (rev 993)
+++ trunk/varnish-cache/include/shmlog_tags.h 2006-09-15 16:10:15 UTC (rev 994)
@@ -15,7 +15,6 @@
SLTM(StatSess)
SLTM(ReqEnd)
SLTM(SessionOpen)
-SLTM(SessionReuse)
SLTM(SessionClose)
SLTM(BackendOpen)
SLTM(BackendXID)