diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-11-20 12:08:14 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-11-20 12:12:23 -0500 |
commit | e572ec856dff263d7f43ec6d42fe3fc3b7557f73 (patch) | |
tree | df9697940769c1effc539a2bbd35894b518a2dd4 /src/or/circuitlist.c | |
parent | 03ff21b018c8d0b005d2a60c3ba2bf08d6cb00bb (diff) | |
download | tor-e572ec856dff263d7f43ec6d42fe3fc3b7557f73.tar.gz tor-e572ec856dff263d7f43ec6d42fe3fc3b7557f73.zip |
Rename MaxMemInCellQueues to MaxMemInQueues
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r-- | src/or/circuitlist.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 3237b1e397..2e135416c2 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1512,11 +1512,11 @@ circuits_compare_by_oldest_queued_item_(const void **a_, const void **b_) return -1; } -#define FRACTION_OF_CELLS_TO_RETAIN_ON_OOM 0.90 +#define FRACTION_OF_DATA_TO_RETAIN_ON_OOM 0.90 /** We're out of memory for cells, having allocated <b>current_allocation</b> * bytes' worth. Kill the 'worst' circuits until we're under - * FRACTION_OF_CIRCS_TO_RETAIN_ON_OOM of our maximum usage. */ + * FRACTION_OF_DATA_TO_RETAIN_ON_OOM of our maximum usage. */ void circuits_handle_oom(size_t current_allocation) { @@ -1530,11 +1530,11 @@ circuits_handle_oom(size_t current_allocation) uint32_t now_ms; log_notice(LD_GENERAL, "We're low on memory. Killing circuits with " "over-long queues. (This behavior is controlled by " - "MaxMemInCellQueues.)"); + "MaxMemInQueues.)"); { - size_t mem_target = (size_t)(get_options()->MaxMemInCellQueues * - FRACTION_OF_CELLS_TO_RETAIN_ON_OOM); + size_t mem_target = (size_t)(get_options()->MaxMemInQueues * + FRACTION_OF_DATA_TO_RETAIN_ON_OOM); if (current_allocation <= mem_target) return; mem_to_recover = current_allocation - mem_target; |