commit d2b2703b96878468df4d9bbf6e3ee2b598c70a45
author Bernie Innocenti <codewiz@google.com> Tue Dec 18 19:53:42 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Dec 20 20:57:10 2018 +0900
tree b379aa95c9f808aea30131d2600e470d4266c7e9
parent a9c8b17254a2bb4b68653f9102b5f73afddbb2c1

Delete dead code for explicitly flushing the resolver cache.

Test: atest resolv_integration_test
Change-Id: I5ee5fab7351a403d288f50ea06997282e2a1fb99

resolv/res_cache.cpp

diff --git a/resolv/res_cache.cpp b/resolv/res_cache.cpp
index 6a3ba20..fd1a324 100644
--- a/resolv/res_cache.cpp
+++ b/resolv/res_cache.cpp
@@ -1267,7 +1267,7 @@
 
 static resolv_cache_info* find_cache_info_locked(unsigned netid);
 
-static void _cache_flush_locked(Cache* cache) {
+static void cache_flush_locked(Cache* cache) {
     int nn;
 
     for (nn = 0; nn < cache->max_entries; nn++) {
@@ -1623,8 +1623,6 @@
 static resolv_cache_info* create_cache_info();
 // gets a resolv_cache_info associated with a network, or NULL if not found
 static resolv_cache_info* find_cache_info_locked(unsigned netid);
-// empty the named cache
-static void flush_cache_for_net_locked(unsigned netid);
 // empty the nameservers set for the named cache
 static void free_nameservers_locked(resolv_cache_info* cache_info);
 // return 1 if the provided list of name servers differs from the list of name servers
@@ -1669,26 +1667,6 @@
     return cache;
 }
 
-void _resolv_flush_cache_for_net(unsigned netid) {
-    pthread_once(&_res_cache_once, res_cache_init);
-    pthread_mutex_lock(&res_cache_list_lock);
-
-    flush_cache_for_net_locked(netid);
-
-    pthread_mutex_unlock(&res_cache_list_lock);
-}
-
-static void flush_cache_for_net_locked(unsigned netid) {
-    resolv_cache* cache = find_named_cache_locked(netid);
-    if (cache) {
-        _cache_flush_locked(cache);
-    }
-
-    // Also clear the NS statistics.
-    resolv_cache_info* cache_info = find_cache_info_locked(netid);
-    res_cache_clear_stats_locked(cache_info);
-}
-
 void resolv_delete_cache_for_net(unsigned netid) {
     pthread_once(&_res_cache_once, res_cache_init);
     pthread_mutex_lock(&res_cache_list_lock);
@@ -1700,7 +1678,7 @@
 
         if (cache_info->netid == netid) {
             prev_cache_info->next = cache_info->next;
-            _cache_flush_locked(cache_info->cache);
+            cache_flush_locked(cache_info->cache);
             free(cache_info->cache->entries);
             free(cache_info->cache);
             free_nameservers_locked(cache_info);