[master] b2731b8 another missing semicolon
Poul-Henning Kamp
phk at FreeBSD.org
Mon Jan 12 11:27:06 CET 2015
commit b2731b843ab272af9177de7b2d9b5c167774f92a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Jan 12 10:26:57 2015 +0000
another missing semicolon
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index de78982..0034203 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -59,6 +59,8 @@ struct sesspool {
struct pool *pool;
struct mempool *mpl_req;
struct mempool *mpl_sess;
+
+ void *http1_waiter;
};
/*--------------------------------------------------------------------
@@ -245,7 +247,7 @@ SES_ScheduleReq(struct req *req)
* Handle a session (from waiter)
*/
-void __match_proto__(waiter_handle_f)
+static void __match_proto__(waiter_handle_f)
SES_Handle(void *ptr, int fd, enum wait_event ev, double now)
{
struct sess *sp;
@@ -276,6 +278,23 @@ SES_Handle(void *ptr, int fd, enum wait_event ev, double now)
}
/*--------------------------------------------------------------------
+ */
+
+void
+SES_Wait(struct sess *sp)
+{
+ struct sesspool *pp;
+
+ CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
+ pp = sp->sesspool;
+ CHECK_OBJ_NOTNULL(pp, SESSPOOL_MAGIC);
+ if (WAIT_Enter(pp->http1_waiter, sp)) {
+ VSC_C_main->sess_pipe_overflow++;
+ SES_Delete(sp, SC_SESS_PIPE_OVERFLOW, NAN);
+ }
+}
+
+/*--------------------------------------------------------------------
* Close a sessions connection.
* XXX: Technically speaking we should catch a t_end timestamp here
* XXX: for SES_Delete() to use.
@@ -440,6 +459,7 @@ SES_NewPool(struct pool *wp, unsigned pool_no)
bprintf(nb, "sess%u", pool_no);
pp->mpl_sess = MPL_New(nb, &cache_param->sess_pool,
&cache_param->workspace_session);
+ pp->http1_waiter = WAIT_Init(SES_Handle);
return (pp);
}
More information about the varnish-commit
mailing list