[tor-commits] [tor/maint-0.3.1] geoip: Make geoip_client_cache_total_allocation() return the counter

[nickm at torproject.org]

commit f08fa974600625e4ea0b21d0143d28fe280008d5
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Feb 5 10:39:10 2018 -0500

    geoip: Make geoip_client_cache_total_allocation() return the counter
    
    The HT_FOREACH() is insanely heavy on the CPU and this is part of the fast
    path so make it return the nice memory size counter we added in
    4d812e29b9b1ec88.
    
    Fixes #25148
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/geoip.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/or/geoip.c b/src/or/geoip.c
index 20dad5f15..a39366ed1 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -769,13 +769,7 @@ geoip_client_cache_handle_oom(time_t now, size_t min_remove_bytes)
 size_t
 geoip_client_cache_total_allocation(void)
 {
-  size_t bytes = 0;
-  clientmap_entry_t **ent;
-
-  HT_FOREACH(ent, clientmap, &client_history) {
-    bytes += clientmap_entry_size(*ent);
-  }
-  return bytes;
+  return geoip_client_history_cache_size;
 }
 
 /** How many responses are we giving to clients requesting v3 network