r3531 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-01-19 14:24:13 +0100 (Mon, 19 Jan 2009)
New Revision: 3531

Modified:
   branches/2.0/varnish-cache/bin/varnishd/varnishd.1
Log:
Merge r3362:

Document the size parameter to -s malloc

Fixes #362


Modified: branches/2.0/varnish-cache/bin/varnishd/varnishd.1
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/varnishd.1	2009-01-19 12:58:44 UTC (rev 3530)
+++ branches/2.0/varnish-cache/bin/varnishd/varnishd.1	2009-01-19 13:24:13 UTC (rev 3531)
@@ -236,9 +236,27 @@
 .Ss Storage Types
 The following storage types are available:
 .Bl -tag -width 4n
-.It Cm malloc
+.It Cm malloc Ns Op Ns , Ns Ar size Ns
 Storage for each object is allocated with
 .Xr malloc 3 .
+.Pp
+The
+.Ar size
+parameter specifies the maximum amount of memory varnishd will allocate.
+The size is assumed to be in bytes, unless followed by one of the
+following suffixes:
+.Bl -tag -width indent
+.It K, k
+The size is expressed in kibibytes.
+.It M, m
+The size is expressed in mebibytes.
+.It G, g
+The size is expressed in gibibytes.
+.It T, t
+The size is expressed in tebibytes.
+.El
+.Pp
+The default size is unlimited.
 .It Cm file Ns Op Ns , Ns Ar path Ns Op Ns , Ns Ar size Ns Op Ns , Ns Ar granularity
 Storage for each object is allocated from an arena backed by a file.
 This is the default.