[experimental-ims] ea74343 A little bit of spit and polish...
Geoff Simmons
geoff at varnish-cache.org
Mon Jan 9 21:51:55 CET 2012
commit ea7434334778be8c38052b6090c25abc63bcc37b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Sat Sep 17 20:25:20 2011 +0000
A little bit of spit and polish...
diff --git a/bin/varnishd/cache_session.c b/bin/varnishd/cache_session.c
index 6b34928..a930c07 100644
--- a/bin/varnishd/cache_session.c
+++ b/bin/varnishd/cache_session.c
@@ -319,27 +319,36 @@ SES_Delete(struct sess *sp, const char *reason)
Lck_Unlock(&stat_mtx);
free(sm);
Lck_Lock(&pp->mtx);
- sesspool->nsess--;
+ pp->nsess--;
Lck_Unlock(&pp->mtx);
} else {
/* Clean and prepare for reuse */
ses_setup(sm);
Lck_Lock(&pp->mtx);
- VTAILQ_INSERT_HEAD(&sesspool->freelist, sm, list);
+ VTAILQ_INSERT_HEAD(&pp->freelist, sm, list);
Lck_Unlock(&pp->mtx);
}
}
/*--------------------------------------------------------------------*/
+static struct sesspool *
+SES_NewPool(unsigned maxsess)
+{
+ struct sesspool *sp;
+
+ ALLOC_OBJ(sp, SESSPOOL_MAGIC);
+ VTAILQ_INIT(&sp->freelist);
+ Lck_New(&sp->mtx, lck_sessmem);
+ sp->maxsess = maxsess;
+ return (sp);
+}
+
+
void
SES_Init()
{
- ALLOC_OBJ(sesspool, SESSPOOL_MAGIC);
- VTAILQ_INIT(&sesspool->freelist);
- Lck_New(&sesspool->mtx, lck_sessmem);
- sesspool->maxsess = params->max_sess;
-
+ sesspool = SES_NewPool(params->max_sess);
Lck_New(&stat_mtx, lck_stat);
}
More information about the varnish-commit
mailing list