From 6591366fcea857061a3787f3e1df367fc1ea06ff Mon Sep 17 00:00:00 2001 From: phk Date: Fri, 7 Mar 2008 11:13:11 +0000 Subject: [PATCH] Split the http_workspace into sess_workspace and obj_workspace, so they can be tuned separately. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2559 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/cache_backend.c | 2 +- varnish-cache/bin/varnishd/cache_hash.c | 2 +- varnish-cache/bin/varnishd/cache_session.c | 4 ++-- varnish-cache/bin/varnishd/heritage.h | 3 ++- varnish-cache/bin/varnishd/mgt_param.c | 12 ++++++++++-- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/varnish-cache/bin/varnishd/cache_backend.c b/varnish-cache/bin/varnishd/cache_backend.c index 23dae5b8..c2f35a0a 100644 --- a/varnish-cache/bin/varnishd/cache_backend.c +++ b/varnish-cache/bin/varnishd/cache_backend.c @@ -230,7 +230,7 @@ VBE_new_bereq(void) if (bereq != NULL) { CHECK_OBJ(bereq, BEREQ_MAGIC); } else { - len = params->mem_workspace; + len = params->sess_workspace; bereq = calloc(sizeof *bereq + len, 1); if (bereq == NULL) return (NULL); diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c index f18c51db..5c628f5d 100644 --- a/varnish-cache/bin/varnishd/cache_hash.c +++ b/varnish-cache/bin/varnishd/cache_hash.c @@ -88,7 +88,7 @@ HSH_Prealloc(struct sess *sp) } else CHECK_OBJ_NOTNULL(w->nobjhead, OBJHEAD_MAGIC); if (w->nobj == NULL) { - st = STV_alloc(sp, params->mem_workspace); + st = STV_alloc(sp, params->obj_workspace); XXXAN(st); assert(st->space > sizeof *w->nobj); w->nobj = (void *)st->ptr; /* XXX: align ? */ diff --git a/varnish-cache/bin/varnishd/cache_session.c b/varnish-cache/bin/varnishd/cache_session.c index 01ae3de6..b15b59b8 100644 --- a/varnish-cache/bin/varnishd/cache_session.c +++ b/varnish-cache/bin/varnishd/cache_session.c @@ -289,7 +289,7 @@ SES_New(const struct sockaddr *addr, unsigned len) * need to cache it locally, to make sure we get a * consistent view of it. */ - u = params->mem_workspace; + u = params->sess_workspace; sm = malloc(sizeof *sm + u); if (sm == NULL) return (NULL); @@ -346,7 +346,7 @@ SES_Delete(struct sess *sp) sp->addr, sp->port, sp->t_end - b->first, b->sess, b->req, b->pipe, b->pass, b->fetch, b->hdrbytes, b->bodybytes); - if (sm->workspace != params->mem_workspace) { + if (sm->workspace != params->sess_workspace) { VSL_stats->n_sess_mem--; free(sm); } else { diff --git a/varnish-cache/bin/varnishd/heritage.h b/varnish-cache/bin/varnishd/heritage.h index 5cd3ecf5..7d011efd 100644 --- a/varnish-cache/bin/varnishd/heritage.h +++ b/varnish-cache/bin/varnishd/heritage.h @@ -85,7 +85,8 @@ struct params { unsigned overflow_max; /* Memory allocation hints */ - unsigned mem_workspace; + unsigned sess_workspace; + unsigned obj_workspace; /* Acceptor hints */ unsigned sess_timeout; diff --git a/varnish-cache/bin/varnishd/mgt_param.c b/varnish-cache/bin/varnishd/mgt_param.c index 8b6edac0..c394ea9f 100644 --- a/varnish-cache/bin/varnishd/mgt_param.c +++ b/varnish-cache/bin/varnishd/mgt_param.c @@ -495,13 +495,21 @@ static const struct parspec parspec[] = { "number of worker threads. ", EXPERIMENTAL, "3", "requests per request" }, - { "http_workspace", tweak_uint, &master.mem_workspace, 1024, UINT_MAX, - "Bytes of HTTP protocol workspace allocated. " + { "sess_workspace", tweak_uint, &master.sess_workspace, 1024, UINT_MAX, + "Bytes of HTTP protocol workspace allocated for sessions. " "This space must be big enough for the entire HTTP protocol " "header and any edits done to it in the VCL code.\n" "Minimum is 1024 bytes.", DELAYED_EFFECT, "8192", "bytes" }, + { "obj_workspace", tweak_uint, &master.obj_workspace, 1024, UINT_MAX, + "Bytes of HTTP protocol workspace allocated for objects. " + "This space must be big enough for the entire HTTP protocol " + "header and any edits done to it in the VCL code while it " + "is cached.\n" + "Minimum is 1024 bytes.", + DELAYED_EFFECT, + "8192", "bytes" }, { "sess_timeout", tweak_timeout, &master.sess_timeout, 0, 0, "Idle timeout for persistent sessions. " "If a HTTP request has not been received in this many " -- 2.39.5