Skip to content

U
unique-xids
Commit 88c77374 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Also update waiter_epoll to new SES_* api.

parent 74e2d3f3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/varnishd/waiter/cache_waiter_epoll.c
View file @ 88c77374
...@@ -133,13 +133,13 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now) ...@@ -133,13 +133,13 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
SES_Handle(sp, now); SES_Handle(sp, now);
} else if (ep->events & EPOLLERR) { } else if (ep->events & EPOLLERR) {
VTAILQ_REMOVE(&vwe->sesshead, sp, list); VTAILQ_REMOVE(&vwe->sesshead, sp, list);
SES_Delete(sp, "ERR", now); SES_Delete(sp, SC_REM_CLOSE, now);
} else if (ep->events & EPOLLHUP) { } else if (ep->events & EPOLLHUP) {
VTAILQ_REMOVE(&vwe->sesshead, sp, list); VTAILQ_REMOVE(&vwe->sesshead, sp, list);
SES_Delete(sp, "HUP", now); SES_Delete(sp, SC_REM_CLOSE, now);
} else if (ep->events & EPOLLRDHUP) { } else if (ep->events & EPOLLRDHUP) {
VTAILQ_REMOVE(&vwe->sesshead, sp, list); VTAILQ_REMOVE(&vwe->sesshead, sp, list);
SES_Delete(sp, "RHUP", now); SES_Delete(sp, SC_REM_CLOSE, now);
} }
} }
} }
...@@ -192,7 +192,7 @@ vwe_thread(void *priv) ...@@ -192,7 +192,7 @@ vwe_thread(void *priv)
break; break;
VTAILQ_REMOVE(&vwe->sesshead, sp, list); VTAILQ_REMOVE(&vwe->sesshead, sp, list);
// XXX: not yet VTCP_linger(sp->fd, 0); // XXX: not yet VTCP_linger(sp->fd, 0);
SES_Delete(sp, "timeout", now); SES_Delete(sp, SC_RX_TIMEOUT, now);
} }
} }
return (NULL); return (NULL);
......
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