HttpServerProperties - Implement MRU for AlternateProtocolMap. Persist

chrome/browser/net/http_server_properties_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
@@ skipping 25 matching lines @@
 
 // "version" 0 indicates, http_server_properties doesn't have "version"
 // property.
 const int kMissingVersion = 0;
 
 // The version number of persisted http_server_properties.
 const int kVersionNumber = 2;
 
 typedef std::vector<std::string> StringVector;
 
+// Persist 200 MRU AlternateProtocolHostPortPairs.
+const int kMaxAlternateProtocolHostsToPersist = 200;
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 //  HttpServerPropertiesManager
 
 HttpServerPropertiesManager::HttpServerPropertiesManager(
     PrefService* pref_service)
     : pref_service_(pref_service),
       setting_prefs_(false) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 114 matching lines @@
   ScheduleUpdatePrefsOnIO();
 }
 
 void HttpServerPropertiesManager::SetBrokenAlternateProtocol(
     const net::HostPortPair& server) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   http_server_properties_impl_->SetBrokenAlternateProtocol(server);
   ScheduleUpdatePrefsOnIO();
 }
 
-const net::AlternateProtocolMap&
-HttpServerPropertiesManager::alternate_protocol_map() const {
+net::AlternateProtocolMap
+HttpServerPropertiesManager::GetAlternateProtocolMap() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return http_server_properties_impl_->alternate_protocol_map();
+  return http_server_properties_impl_->GetAlternateProtocolMap();
 }
 
 const net::SettingsMap&
 HttpServerPropertiesManager::GetSpdySettings(
     const net::HostPortPair& host_port_pair) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return http_server_properties_impl_->GetSpdySettings(host_port_pair);
 }
 
 bool HttpServerPropertiesManager::SetSpdySetting(
@@ skipping 310 matching lines @@
 
   base::ListValue* spdy_server_list = new base::ListValue;
   http_server_properties_impl_->GetSpdyServerList(spdy_server_list);
 
   net::SpdySettingsMap* spdy_settings_map = new net::SpdySettingsMap;
   *spdy_settings_map = http_server_properties_impl_->spdy_settings_map();
 
   net::AlternateProtocolMap* alternate_protocol_map =
       new net::AlternateProtocolMap;
   *alternate_protocol_map =
-      http_server_properties_impl_->alternate_protocol_map();
+      http_server_properties_impl_->GetAlternateProtocolMap();
 
   net::PipelineCapabilityMap* pipeline_capability_map =
       new net::PipelineCapabilityMap;
   *pipeline_capability_map =
       http_server_properties_impl_->GetPipelineCapabilityMap();
 
   // Update the preferences on the UI thread.
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
@@ skipping 53 matching lines @@
       if (it == server_pref_map.end()) {
         ServerPref server_pref(true, NULL, NULL);
         server_pref_map[server] = server_pref;
       } else {
         it->second.supports_spdy = true;
       }
     }
   }
 
   // Add servers that have SpdySettings to server_pref_map.
-  for (net::SpdySettingsMap::iterator map_it =
-       spdy_settings_map->begin();
+  for (net::SpdySettingsMap::iterator map_it = spdy_settings_map->begin();
        map_it != spdy_settings_map->end(); ++map_it) {
     const net::HostPortPair& server = map_it->first;
 
     ServerPrefMap::iterator it = server_pref_map.find(server);
     if (it == server_pref_map.end()) {
       ServerPref server_pref(false, &map_it->second, NULL);
       server_pref_map[server] = server_pref;
     } else {
       it->second.settings_map = &map_it->second;
     }
   }
 
   // Add AlternateProtocol servers to server_pref_map.
+  int count = 0;
   for (net::AlternateProtocolMap::const_iterator map_it =

[Ryan Hamilton, 2014/03/05 00:19:20]

What guarantee do we have that this iterator is going to go in LRU order?

[ramant (doing other things), 2014/03/05 15:11:11]

Many thanks for the catch. My fault (had only 200 for memory cache ala PipeLine
code).

Changed the code to use MruCache.
 
Done.

-       alternate_protocol_map->begin();
-       map_it != alternate_protocol_map->end(); ++map_it) {
+           alternate_protocol_map->begin();
+       map_it != alternate_protocol_map->end() &&
+           count < kMaxAlternateProtocolHostsToPersist;
+       ++map_it) {
     const net::HostPortPair& server = map_it->first;
     const net::PortAlternateProtocolPair& port_alternate_protocol =
         map_it->second;
     if (!net::IsAlternateProtocolValid(port_alternate_protocol.protocol)) {
       continue;
     }
 
     ServerPrefMap::iterator it = server_pref_map.find(server);
     if (it == server_pref_map.end()) {
       ServerPref server_pref(false, NULL, &map_it->second);
       server_pref_map[server] = server_pref;
     } else {
       it->second.alternate_protocol = &map_it->second;
     }
+    ++count;
   }
 
   for (net::PipelineCapabilityMap::const_iterator map_it =
            pipeline_capability_map->begin();
        map_it != pipeline_capability_map->end(); ++map_it) {
     const net::HostPortPair& server = map_it->first;
     const net::HttpPipelinedHostCapability& pipeline_capability =
         map_it->second;
 
     ServerPrefMap::iterator it = server_pref_map.find(server);
@@ skipping 72 matching lines @@
     completion.Run();
 }
 
 void HttpServerPropertiesManager::OnHttpServerPropertiesChanged() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!setting_prefs_)
     ScheduleUpdateCacheOnUI();
 }
 
 }  // namespace chrome_browser_net