[tor-commits] [tor/master] reindent cell_queues_check_size()
nickm at torproject.org
nickm at torproject.org
Mon Jan 12 18:59:57 UTC 2015
commit cacea9102a2431ce8e7e431629a91a43331ac9f9
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jan 12 13:59:50 2015 -0500
reindent cell_queues_check_size()
---
src/or/relay.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/or/relay.c b/src/or/relay.c
index 28211ff..f878c9d 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2451,20 +2451,20 @@ cell_queues_check_size(void)
alloc += rend_cache_total;
if (alloc >= get_options()->MaxMemInQueues_low_threshold) {
last_time_under_memory_pressure = approx_time();
- if (alloc >= get_options()->MaxMemInQueues) {
- /* If we're spending over 20% of the memory limit on hidden service
- * descriptors, free them until we're down to 10%.
- */
- if (rend_cache_total > get_options()->MaxMemInQueues / 5) {
- const size_t bytes_to_remove =
- rend_cache_total - (get_options()->MaxMemInQueues / 10);
- rend_cache_clean_v2_descs_as_dir(time(NULL), bytes_to_remove);
- alloc -= rend_cache_total;
- alloc += rend_cache_get_total_allocation();
+ if (alloc >= get_options()->MaxMemInQueues) {
+ /* If we're spending over 20% of the memory limit on hidden service
+ * descriptors, free them until we're down to 10%.
+ */
+ if (rend_cache_total > get_options()->MaxMemInQueues / 5) {
+ const size_t bytes_to_remove =
+ rend_cache_total - (get_options()->MaxMemInQueues / 10);
+ rend_cache_clean_v2_descs_as_dir(time(NULL), bytes_to_remove);
+ alloc -= rend_cache_total;
+ alloc += rend_cache_get_total_allocation();
+ }
+ circuits_handle_oom(alloc);
+ return 1;
}
- circuits_handle_oom(alloc);
- return 1;
- }
}
return 0;
}
More information about the tor-commits
mailing list