Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tor Trac #18642: Teach the OOM handler about the DNS cache (Revision 2) #239

Merged
merged 4 commits into from Aug 10, 2018
Merged

Tor Trac #18642: Teach the OOM handler about the DNS cache (Revision 2) #239

merged 4 commits into from Aug 10, 2018

Conversation

Reviewers

@nmathewson nmathewson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@neelchauhan @coveralls @nmathewson @torproject-pusher
@neelchauhan
Copy link
Contributor

@neelchauhan neelchauhan commented Jul 17, 2018

For the bug report here.
neelchauhan added 3 commits Jul 16, 2018
@neelchauhan
Add and use dns_cache_total_allocation()
d807ca1
@neelchauhan
Teach the OOM handler about the DNS cache
32db806
@neelchauhan
Add changes file for Bug #18642
7c052d4
@coveralls
Copy link

@coveralls coveralls commented Jul 17, 2018 •
edited

Coverage Status

Coverage increased (+0.02%) to 59.543% when pulling a207511 on neelchauhan:b18642b into 5aaea38 on torproject:master.

nmathewson
nmathewson reviewed Aug 8, 2018
View changes
Copy link
Contributor

@nmathewson nmathewson left a comment

Hi! There's one small fix I think we need here. Other than that, this looks fine to me. Thanks!

src/core/or/relay.c
@@ -2537,6 +2538,7 @@ cell_queues_check_size(void)
const size_t geoip_client_cache_total =
geoip_client_cache_total_allocation();
alloc += geoip_client_cache_total;
const size_t dns_cache_total = dns_cache_total_allocation();
Copy link
Contributor

@nmathewson nmathewson Aug 8, 2018

At this point, shouldn't we also add dns_cache_total to alloc?

"alloc" is the total amount of bytes allocated that we might be able to free, so I think we should include the DNS bytes here, especially since we subtract them from "alloc" below.

@neelchauhan
In cell_queues_check_size(), add DNS cache size to total memory alloc…
a207511 
…ation
@torproject-pusher torproject-pusher merged commit a207511 into torproject:master Aug 10, 2018
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment