r5559 - trunk/varnish-cache/bin/varnishd

[phk at varnish-cache.org]

Author: phk
Date: 2010-11-20 22:59:05 +0100 (Sat, 20 Nov 2010)
New Revision: 5559

Modified:
   trunk/varnish-cache/bin/varnishd/stevedore.c
Log:
Open the transient (malloc) stevedore and let it be used for
non-cacheable objects, rather than direct mallocs.



Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-20 21:40:42 UTC (rev 5558)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2010-11-20 21:59:05 UTC (rev 5559)
@@ -223,9 +223,8 @@
 	struct object *o;
 	struct storage *st;
 
-	(void)stv;		/* XXX */
 	CHECK_OBJ_NOTNULL(soc, STV_OBJ_SECRETES_MAGIC);
-	st = stv_alloc(sp, ltot, sp->objcore);
+	st = stv->alloc(stv, ltot, sp->objcore);
 	XXXAN(st);
 	xxxassert(st->space >= ltot);
 	ltot = st->len = st->space;
@@ -354,6 +353,9 @@
 		if (stv->open != NULL)
 			stv->open(stv);
 	}
+	stv = stv_transient;
+	if (stv->open != NULL)
+		stv->open(stv);
 }
 
 void