From 7f37478b1ef190dfad93974a0fd656cd142ae04b Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sat, 18 Apr 2009 10:09:22 +1200 Subject: [PATCH] Cleanup magic buffer sizes in helper.cc Was an pair of 8KB magic numbers. Not made a single define with comments to indicate what it is. --- src/helper.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/helper.cc b/src/helper.cc index 4965b738d5..e412659441 100644 --- a/src/helper.cc +++ b/src/helper.cc @@ -1,4 +1,3 @@ - /* * $Id$ * @@ -43,6 +42,11 @@ #define HELPER_MAX_ARGS 64 +/* size of helper read buffer (maximum?). no reason given for this size */ +/* though it has been seen to be too short for some requests */ +/* it is dynamic, so increasng should not have side effects */ +#define BUF_8KB 8192 + static IOCB helperHandleRead; static IOCB helperStatefulHandleRead; static PF helperServerFree; @@ -147,7 +151,7 @@ helperOpenServers(helper * hlp) srv->addr = hlp->addr; srv->rfd = rfd; srv->wfd = wfd; - srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz); + srv->rbuf = (char *)memAllocBuf(BUF_8KB, &srv->rbuf_sz); srv->wqueue = new MemBuf; srv->roffset = 0; srv->requests = (helper_request **)xcalloc(hlp->concurrency ? hlp->concurrency : 1, sizeof(*srv->requests)); @@ -261,7 +265,7 @@ helperStatefulOpenServers(statefulhelper * hlp) srv->addr = hlp->addr; srv->rfd = rfd; srv->wfd = wfd; - srv->rbuf = (char *)memAllocBuf(8192, &srv->rbuf_sz); + srv->rbuf = (char *)memAllocBuf(BUF_8KB, &srv->rbuf_sz); srv->roffset = 0; srv->parent = cbdataReference(hlp); @@ -288,7 +292,6 @@ helperStatefulOpenServers(statefulhelper * hlp) comm_add_close_handler(rfd, helperStatefulServerFree, srv); comm_read(srv->rfd, srv->rbuf, srv->rbuf_sz - 1, helperStatefulHandleRead, srv); - } hlp->last_restart = squid_curtime; -- 2.47.2