r1684 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2007-07-13 09:27:50 +0200 (Fri, 13 Jul 2007)
New Revision: 1684

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_session.c
Log:
Clean all but t_open timestamps to NAN at end of transaction.


Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-07-13 07:21:46 UTC (rev 1683)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-07-13 07:27:50 UTC (rev 1684)
@@ -58,6 +58,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -196,8 +197,11 @@
 	    sp->xid, sp->t_req, sp->t_end, dh, dp, da);
 
 	sp->xid = 0;
+	SES_Charge(sp);
 	sp->t_open = sp->t_end;
-	SES_Charge(sp);
+	sp->t_req = NAN;
+	sp->t_resp = NAN;
+	sp->t_end = NAN;
 	WSL_Flush(sp->wrk);
 	if (sp->fd >= 0 && sp->doclose != NULL)
 		vca_close_session(sp, sp->doclose);

Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c	2007-07-13 07:21:46 UTC (rev 1683)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c	2007-07-13 07:27:50 UTC (rev 1684)
@@ -229,6 +229,7 @@
 
 	ses_sum_acct(&sp->acct, a);
 	if (sp->srcaddr != NULL) {
+		/* XXX: only report once per second ? */
 		CHECK_OBJ(sp->srcaddr, SRCADDR_MAGIC);
 		LOCK(&sp->srcaddr->sah->mtx);
 		ses_sum_acct(&sp->srcaddr->acct, a);