[master] 88c7737 Also update waiter_epoll to new SES_* api.

Poul-Henning Kamp phk at varnish-cache.org
Tue Jul 3 14:46:37 CEST 2012


commit 88c77374bab8f4c63235005200a452ae29b669b0
Author: Poul-Henning Kamp <phk at varnish-cache.org>
Date:   Tue Jul 3 14:46:06 2012 +0200

    Also update waiter_epoll to new SES_* api.

diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
index 6ad5be5..a15bbe5 100644
--- a/bin/varnishd/waiter/cache_waiter_epoll.c
+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
@@ -133,13 +133,13 @@ vwe_eev(struct vwe *vwe, const struct epoll_event *ep, double now)
 			SES_Handle(sp, now);
 		} else if (ep->events & EPOLLERR) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Delete(sp, "ERR", now);
+			SES_Delete(sp, SC_REM_CLOSE, now);
 		} else if (ep->events & EPOLLHUP) {
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
-			SES_Delete(sp, "HUP", now);
+			SES_Delete(sp, SC_REM_CLOSE, now);
 		} else if (ep->events & EPOLLRDHUP) {
 			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)
 				break;
 			VTAILQ_REMOVE(&vwe->sesshead, sp, list);
 			// XXX: not yet VTCP_linger(sp->fd, 0);
-			SES_Delete(sp, "timeout", now);
+			SES_Delete(sp, SC_RX_TIMEOUT, now);
 		}
 	}
 	return (NULL);



More information about the varnish-commit mailing list