Skip to content

V
varnish-cache
Commit 48d6d380 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Minor fixes to make destroying waiters work

parent bab3db55
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
bin/varnishd/waiter/cache_waiter.c
View file @ 48d6d380
...@@ -185,7 +185,7 @@ Wait_Enter(const struct waiter *w, struct waited *wp) ...@@ -185,7 +185,7 @@ Wait_Enter(const struct waiter *w, struct waited *wp)
CHECK_OBJ_NOTNULL(w, WAITER_MAGIC); CHECK_OBJ_NOTNULL(w, WAITER_MAGIC);
CHECK_OBJ_NOTNULL(wp, WAITED_MAGIC); CHECK_OBJ_NOTNULL(wp, WAITED_MAGIC);
assert(wp->fd >= 0); assert(wp->fd > 0); // stdin never comes here
AZ(w->dismantle); AZ(w->dismantle);
if (w->impl->pass != NULL) if (w->impl->pass != NULL)
...@@ -245,11 +245,11 @@ Wait_Handle(struct waiter *w, struct waited *wp, enum wait_event ev, double now) ...@@ -245,11 +245,11 @@ Wait_Handle(struct waiter *w, struct waited *wp, enum wait_event ev, double now)
return; return;
for (j = 0; i >= sizeof ss[0]; j++, i -= sizeof ss[0]) { for (j = 0; i >= sizeof ss[0]; j++, i -= sizeof ss[0]) {
CHECK_OBJ_NOTNULL(ss[j], WAITED_MAGIC); CHECK_OBJ_ORNULL(ss[j], WAITED_MAGIC);
if (ss[j] == w->pipe_w) { if (ss[j] == NULL) {
dotimer = 1;
} else if (ss[j] == NULL) {
AN(w->dismantle); AN(w->dismantle);
} else if (ss[j] == w->pipe_w) {
dotimer = 1;
} else { } else {
assert(ss[j]->fd >= 0); assert(ss[j]->fd >= 0);
VTAILQ_INSERT_TAIL(&w->waithead, ss[j], list); VTAILQ_INSERT_TAIL(&w->waithead, ss[j], list);
...@@ -258,6 +258,8 @@ Wait_Handle(struct waiter *w, struct waited *wp, enum wait_event ev, double now) ...@@ -258,6 +258,8 @@ Wait_Handle(struct waiter *w, struct waited *wp, enum wait_event ev, double now)
} }
AZ(i); AZ(i);
wait_updidle(w, now);
if (!dotimer) if (!dotimer)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment