Changeset b39e11


Ignore:
Timestamp:
2010-02-08 21:20:00 (4 years ago)
Author:
Poul-Henning Kamp <phk@…>
Branches:
master, 3.0, 4.0, experimental-ims
Children:
a09153
Parents:
58167a8
git-author:
Poul-Henning Kamp <phk@…> (2010-02-08 21:20:00)
git-committer:
Poul-Henning Kamp <phk@…> (2010-02-08 21:20:00)
Message:

Remove obj_workspace parameter. We autosize it for just what is needed.

git-svn-id:  http://www.varnish-cache.org/svn/trunk/varnish-cache@4539 d4fa192b-c00b-0410-8231-f00ffab90ce4

Location:
bin/varnishd
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • bin/varnishd/cache_center.c

    r8c8c7e rb39e11  
    337337                HSH_Prealloc(sp); 
    338338                sp->wrk->cacheable = 0; 
    339                 sp->obj = STV_NewObject(sp, 0, 0, params->http_headers); 
     339                /* XXX: 1024 is a pure guess */ 
     340                sp->obj = STV_NewObject(sp, 1024, 0, params->http_headers); 
    340341                sp->obj->xid = sp->xid; 
    341342                sp->obj->entered = sp->t_req; 
  • bin/varnishd/heritage.h

    rd44838b rb39e11  
    100100        /* Memory allocation hints */ 
    101101        unsigned                sess_workspace; 
    102         unsigned                obj_workspace; 
    103102        unsigned                shm_workspace; 
    104103        unsigned                http_headers; 
  • bin/varnishd/mgt_param.c

    ree901d rb39e11  
    536536                0, 
    537537                "64", "header lines" }, 
    538         { "obj_workspace", tweak_uint, &master.obj_workspace, 0, UINT_MAX, 
    539                 "Bytes of HTTP protocol workspace allocated for objects. " 
    540                 "This space must be big enough for the entire HTTP protocol " 
    541                 "header and any edits done to it in the VCL code while it " 
    542                 "is cached.\n" 
    543                 "Minimum is 1024 bytes.", 
    544                 DELAYED_EFFECT, 
    545                 "0", "bytes" }, 
    546538        { "shm_workspace", tweak_uint, &master.shm_workspace, 4096, UINT_MAX, 
    547539                "Bytes of shmlog workspace allocated for worker threads. " 
  • bin/varnishd/stevedore.c

    rc1f856 rb39e11  
    118118 
    119119        (void)ttl; 
    120         if (l == 0) 
    121                 l = 1024; 
    122         if (params->obj_workspace > 0 && params->obj_workspace > l) 
    123                 l =  params->obj_workspace; 
     120        assert(l > 0); 
    124121 
    125122        lh = HTTP_estimate(nhttp); 
  • bin/varnishd/varnishd.1

    r146dea5 rb39e11  
    896896Be aware that restarts are likely to cause a hit against the backend, so don't increase thoughtlessly. 
    897897.Pp 
    898 .It Va obj_workspace 
    899 Units: 
    900 .Dv bytes 
    901 .br 
    902 Default: 
    903 .Dv 0 
    904 .br 
    905 Flags: 
    906 .Dv "delayed" 
    907 .br 
    908 .Pp 
    909 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. 
    910 .br 
    911 Minimum is 1024 bytes. 
    912 .Pp 
    913898.It Va overflow_max 
    914899Units: 
Note: See TracChangeset for help on using the changeset viewer.