diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-16 09:55:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:15:16 -0400 |
| commit | 2e1fe1fcf93c2a77805048bea5c535ca4456d583 (patch) | |
| tree | 6a396bc09f558b9611282de2d54a7f7824696095 /src/or/relay.h | |
| parent | 2a95f3171681ee53c97ccba9d80f4454b462aaa7 (diff) | |
| download | tor-2e1fe1fcf93c2a77805048bea5c535ca4456d583.tar.gz tor-2e1fe1fcf93c2a77805048bea5c535ca4456d583.zip | |
Implement a real OOM-killer for too-long circuit queues.
This implements "algorithm 1" from my discussion of bug #9072: on OOM,
find the circuits with the longest queues, and kill them. It's also a
fix for #9063 -- without the side-effects of bug #9072.
The memory bounds aren't perfect here, and you need to be sure to
allow some slack for the rest of Tor's usage.
This isn't a perfect fix; the rest of the solutions I describe on
codeable.
Diffstat (limited to 'src/or/relay.h')
| -rw-r--r-- | src/or/relay.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/relay.h b/src/or/relay.h index 41675e2106..c55813b33c 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -40,6 +40,7 @@ void init_cell_pool(void); void free_cell_pool(void); void clean_cell_pool(void); void dump_cell_pool_usage(int severity); +size_t packed_cell_mem_cost(void); void cell_queue_clear(cell_queue_t *queue); void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell); |