r3811 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-02-23 12:31:08 +0100 (Mon, 23 Feb 2009)
New Revision: 3811

Modified:
   trunk/varnish-cache/bin/varnishd/stevedore.c
   trunk/varnish-cache/bin/varnishd/storage_persistent.c
Log:
Move on to the worker process side of persistent storage



Modified: trunk/varnish-cache/bin/varnishd/stevedore.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/stevedore.c	2009-02-23 11:07:06 UTC (rev 3810)
+++ trunk/varnish-cache/bin/varnishd/stevedore.c	2009-02-23 11:31:08 UTC (rev 3811)
@@ -60,6 +60,7 @@
 		stv_next = stv;
 
 		/* try to allocate from it */
+		AN(stv->alloc);
 		st = stv->alloc(stv, size);
 		if (st != NULL)
 			break;

Modified: trunk/varnish-cache/bin/varnishd/storage_persistent.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-02-23 11:07:06 UTC (rev 3810)
+++ trunk/varnish-cache/bin/varnishd/storage_persistent.c	2009-02-23 11:31:08 UTC (rev 3811)
@@ -28,6 +28,9 @@
  * $Id$
  *
  * Persistent storage method
+ *
+ * XXX: Before we start the client or maybe after it stops, we should give the
+ * XXX: stevedores a chance to examine their storage for consistency.
  */
 
 #include "config.h"
@@ -266,7 +269,11 @@
 	smp_newsilo(sc);
 	fprintf(stderr, "Silo: %d\n", smp_valid_silo(sc));
 	AZ(smp_valid_silo(sc));
-	exit (2);
+
+	parent->priv = sc;
+
+	/* XXX: only for sendfile I guess... */
+	mgt_child_inherit(sc->fd, "storage_persistent");
 }
 
 /*--------------------------------------------------------------------*/