[experimental-ims] e541ffb Use the busyobj->vbc also for pipe, so that panic can see it.
Geoff Simmons
geoff at varnish-cache.org
Mon Jan 9 21:52:50 CET 2012
commit e541ffbd0e75dfa163ea6dabfe426d905a5cb81a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Dec 8 08:01:08 2011 +0000
Use the busyobj->vbc also for pipe, so that panic can see it.
diff --git a/bin/varnishd/cache/cache_pipe.c b/bin/varnishd/cache/cache_pipe.c
index 8963fb7..cc98fba 100644
--- a/bin/varnishd/cache/cache_pipe.c
+++ b/bin/varnishd/cache/cache_pipe.c
@@ -69,11 +69,13 @@ PipeSession(struct sess *sp)
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
CHECK_OBJ_NOTNULL(sp->wrk, WORKER_MAGIC);
+ CHECK_OBJ_NOTNULL(sp->wrk->busyobj, BUSYOBJ_MAGIC);
w = sp->wrk;
vc = VDI_GetFd(NULL, sp);
if (vc == NULL)
return;
+ sp->wrk->busyobj->vbc = vc; /* For panic dumping */
(void)VTCP_blocking(vc->fd);
WRW_Reserve(w, &vc->fd);
@@ -129,4 +131,5 @@ PipeSession(struct sess *sp)
}
SES_Close(sp, "pipe");
VDI_CloseFd(sp->wrk, &vc);
+ sp->wrk->busyobj->vbc = NULL;
}
More information about the varnish-commit
mailing list