[PATCH] Cleanup references to sess_workspace in docs help

Andreas Plesner Jacobsen apj at mutt.dk
Thu Jan 19 18:19:43 CET 2012


Found by: Federico G. Schwindt <fgsch at lodoss.net>
---
 bin/varnishd/mgt/mgt_param.c      |   12 ++++++------
 doc/sphinx/reference/params.rst   |   12 ++----------
 doc/sphinx/reference/varnishd.rst |    6 ++++--
 doc/sphinx/reference/vmod.rst     |    2 +-
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index c984aae..c8f652b 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -705,9 +705,9 @@ static const struct parspec input_parspec[] = {
 		"Maximum number of bytes of HTTP client request we will deal "
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
-		"The memory for the request is allocated from the session "
-		"workspace (param: sess_workspace) and this parameter limits "
-		"how much of that the request is allowed to take up.",
+		"The memory for the request is allocated from the client "
+		"workspace (param: workspace_client) and this parameter "
+		"limits how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
 	{ "http_resp_hdr_len",
@@ -723,9 +723,9 @@ static const struct parspec input_parspec[] = {
 		"Maximum number of bytes of HTTP backend resonse we will deal "
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
-		"The memory for the request is allocated from the worker "
-		"workspace (param: sess_workspace) and this parameter limits "
-		"how much of that the request is allowed to take up.",
+		"The memory for the request is allocated from the thread pool "
+		"workspace (param: thread_pool_workspace) and this parameter "
+		"limits how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
 	{ "http_max_hdr", tweak_uint, &mgt_param.http_max_hdr, 32, 65535,
diff --git a/doc/sphinx/reference/params.rst b/doc/sphinx/reference/params.rst
index f161596..1f9a486 100644
--- a/doc/sphinx/reference/params.rst
+++ b/doc/sphinx/reference/params.rst
@@ -250,7 +250,7 @@ http_req_size
 	- Default: 32768
 
 	Maximum number of bytes of HTTP client request we will deal with.  This is a limit on all bytes up to the double blank line which ends the HTTP request.
-	The memory for the request is allocated from the session workspace (param: sess_workspace) and this parameter limits how much of that the request is allowed to take up.
+	The memory for the request is allocated from the client workspace (param: workspace_client) and this parameter limits how much of that the request is allowed to take up.
 
 http_resp_hdr_len
 	- Units: bytes
@@ -263,7 +263,7 @@ http_resp_size
 	- Default: 32768
 
 	Maximum number of bytes of HTTP backend resonse we will deal with.  This is a limit on all bytes up to the double blank line which ends the HTTP request.
-	The memory for the request is allocated from the worker workspace (param: sess_workspace) and this parameter limits how much of that the request is allowed to take up.
+	The memory for the request is allocated from the thread pool workspace (param: thread_pool_workspace) and this parameter limits how much of that the request is allowed to take up.
 
 listen_address
 	- Default: :80
@@ -378,14 +378,6 @@ sess_timeout
 
 	Idle timeout for persistent sessions. If a HTTP request has not been received in this many seconds, the session is closed.
 
-sess_workspace
-	- Units: bytes
-	- Default: 65536
-	- Flags: delayed
-
-	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.
-	Minimum is 1024 bytes.
-
 session_linger
 	- Units: ms
 	- Default: 50
diff --git a/doc/sphinx/reference/varnishd.rst b/doc/sphinx/reference/varnishd.rst
index 4e2b3f2..351c7b3 100644
--- a/doc/sphinx/reference/varnishd.rst
+++ b/doc/sphinx/reference/varnishd.rst
@@ -274,8 +274,10 @@ Here is a list of all parameters, current as of last time we remembered to updat
 produced from the same text you will find in the CLI if you use the param.show command, so should there be a new
 parameter which is not listed here, you can find the description using the CLI commands.
 
-Be aware that on 32 bit systems, certain default values, such as sess_workspace (=16k) and thread_pool_stack
-(=64k) are reduced relative to the values listed here, in order to conserve VM space.
+Be aware that on 32 bit systems, certain default values, such as
+workspace_client (=16k), thread_pool_workspace (=16k), http_resp_size (=8k),
+http_req_size (=12k), gzip_stack_buffer (=4k) and thread_pool_stack (=64k) are
+reduced relative to the values listed here, in order to conserve VM space.
 
 .. include:: params.rst
 
diff --git a/doc/sphinx/reference/vmod.rst b/doc/sphinx/reference/vmod.rst
index 2b515c1..57163c5 100644
--- a/doc/sphinx/reference/vmod.rst
+++ b/doc/sphinx/reference/vmod.rst
@@ -171,7 +171,7 @@ STRING_LIST
 	a function, we may relax that at a latter time.
 
 	If you don't want to bother with STRING_LIST, just use STRING
-	and make sure your sess_workspace param is big enough.
+	and make sure your thread_pool_workspace param is big enough.
 
 PRIV_VCL
 	See below
-- 
1.7.8.3




More information about the varnish-dev mailing list