r1863 - in branches/1.1: . bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-08-20 09:51:03 +0200 (Mon, 20 Aug 2007)
New Revision: 1863

Modified:
   branches/1.1/
   branches/1.1/bin/varnishd/cache_center.c
Log:
Merged revisions 1862 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1862 | phk | 2007-08-20 09:35:10 +0200 (Mon, 20 Aug 2007) | 5 lines
  
  Add more asserts to try to find a cure for #150.
  
  Don't nuke t_end timestamp, we need it for StatSess logentry.
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862

Modified: branches/1.1/bin/varnishd/cache_center.c
===================================================================
--- branches/1.1/bin/varnishd/cache_center.c	2007-08-20 07:35:10 UTC (rev 1862)
+++ branches/1.1/bin/varnishd/cache_center.c	2007-08-20 07:51:03 UTC (rev 1863)
@@ -211,12 +211,12 @@
 	sp->t_open = sp->t_end;
 	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);
 	if (sp->fd < 0) {
 		VSL_stats->sess_closed++;
+		assert(!isnan(sp->wrk->used));
 		sp->wrk = NULL;
 		vca_return_session(sp);
 		return (1);
@@ -233,6 +233,7 @@
 		return (0);
 	}
 	VSL_stats->sess_herd++;
+	assert(!isnan(sp->wrk->used));
 	sp->wrk = NULL;
 	vca_return_session(sp);
 	return (1);
@@ -487,6 +488,7 @@
 		 */
 		WSL(sp->wrk, SLT_Debug, sp->fd,
 		    "on waiting list on obj %u", sp->obj->xid);
+		assert(!isnan(sp->wrk->used));
 		SES_Charge(sp);
 		return (1);
 	}
@@ -786,6 +788,7 @@
 		if (w->nobjhead != NULL)
 			CHECK_OBJ(w->nobjhead, OBJHEAD_MAGIC);
 	}
+	assert(!isnan(w->used));
 	WSL_Flush(w);
 }