summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-17 18:20:03 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-17 18:20:03 -0400
commit47df912f1c5a8783fb6edafc72b044ec0ae774ec (patch)
tree8688b10542b2ca6532ba1e86f5e18caa0a62be0e /doc
parent780d1b44cf24ad8ef321b99d8fc591f110456f98 (diff)
downloadtor-47df912f1c5a8783fb6edafc72b044ec0ae774ec.tar.gz
tor-47df912f1c5a8783fb6edafc72b044ec0ae774ec.zip
Remove the periodic refill event entirely.
Now that we update our buckets on demand before reading or writing, we no longer need to update them all every TokenBucketRefillInterval msec. When a connection runs out of bandwidth, we do need a way to reenable it, however. We do this by scheduling a timer to reenable all blocked connections for TokenBucketRefillInterval msec after a connection becomes blocked. (If we were using PerConnBWRate more, it might make sense to have a per-connection timer, rather than a single timeout. But since PerConnBWRate is currently (mostly) unused, I'm going to go for the simpler approach here, since usually whenever one connection has become blocked on bandwidth, most connections are blocked on bandwidth.) Implements ticket 25373.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 95620a3344..1be9f70918 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1285,9 +1285,11 @@ The following options are useful only for clients (that is, if
2 minutes)
[[TokenBucketRefillInterval]] **TokenBucketRefillInterval** __NUM__ [**msec**|**second**]::
- Set the refill interval of Tor's token bucket to NUM milliseconds.
- NUM must be between 1 and 1000, inclusive. Note that the configured
- bandwidth limits are still expressed in bytes per second: this
+ Set the refill delay interval of Tor's token bucket to NUM milliseconds.
+ NUM must be between 1 and 1000, inclusive. When Tor is out of bandwidth,
+ on a connection or globally, it will wait up to this long before it tries
+ to use that connection again.
+ Note that bandwidth limits are still expressed in bytes per second: this
option only affects the frequency with which Tor checks to see whether
previously exhausted connections may read again.
Can not be changed while tor is running. (Default: 100 msec)