diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-19 10:59:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-24 13:04:27 -0400 |
| commit | 8e55cafd672353979e7628d5dad9e12429b401dd (patch) | |
| tree | 5c21280017363ee9b31356013d7ab5961bfa4f04 /changes | |
| parent | ec59167cae1f5b3057ed722857d78ec78239e991 (diff) | |
| download | tor-8e55cafd672353979e7628d5dad9e12429b401dd.tar.gz tor-8e55cafd672353979e7628d5dad9e12429b401dd.zip | |
Count zlib buffer memory towards OOM totals.
Part of 11792.
(Uses the zlib-endorsed formula for memory needs for inflate/deflate
from "zconf.h".)
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug11792 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug11792 b/changes/bug11792 index 1d381891db..7395b4aba5 100644 --- a/changes/bug11792 +++ b/changes/bug11792 @@ -2,4 +2,10 @@ - When closing an edge connection because we've run out of memory, also count the amount of memory that any tunnelled directory connection attached to that connection had consumed. Part of - ticket 11792.
\ No newline at end of file + ticket 11792. + + - When considering whether we're running low on memory, consider + memory that was allocated as part of zlib buffers as well. + Count that memory as reclaimed by our OOM handler. Part of + ticket 11792. + |