Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: net/dns/dns_socket_pool.cc

Issue 24616002: Clean up a few unused globals. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/dns/dns_socket_pool.cc
diff --git a/net/dns/dns_socket_pool.cc b/net/dns/dns_socket_pool.cc
index 7a7ecd6ee8fc4606ce9b7cc8767281bf5aca64c4..b2dd89b32765a11dd497185327ef7d34be7459fc 100644
--- a/net/dns/dns_socket_pool.cc
+++ b/net/dns/dns_socket_pool.cc
@@ -21,8 +21,7 @@ namespace {
// When we initialize the SocketPool, we allocate kInitialPoolSize sockets.
// When we allocate a socket, we ensure we have at least kAllocateMinSize
-// sockets to choose from. When we free a socket, we retain it if we have
-// less than kRetainMaxSize sockets in the pool.
+// sockets to choose from. Freed sockets are not retained.
// On Windows, we can't request specific (random) ports, since that will
// trigger firewall prompts, so request default ones, but keep a pile of
@@ -31,12 +30,10 @@ namespace {
const DatagramSocket::BindType kBindType = DatagramSocket::DEFAULT_BIND;
const unsigned kInitialPoolSize = 256;
const unsigned kAllocateMinSize = 256;
-const unsigned kRetainMaxSize = 0;
#else
const DatagramSocket::BindType kBindType = DatagramSocket::RANDOM_BIND;
const unsigned kInitialPoolSize = 0;
const unsigned kAllocateMinSize = 1;
-const unsigned kRetainMaxSize = 0;
#endif
} // namespace
@@ -208,15 +205,6 @@ void DefaultDnsSocketPool::FreeSocket(
unsigned server_index,
scoped_ptr<DatagramClientSocket> socket) {
DCHECK_LT(server_index, pools_.size());
-
- // In some builds, kRetainMaxSize will be 0 if we never reuse sockets.
- // In that case, don't compile this code to avoid a "tautological
- // comparison" warning from clang.
-#if kRetainMaxSize > 0
- SocketVector& pool = pools_[server_index];
- if (pool.size() < kRetainMaxSize)
- pool.push_back(socket.release());
-#endif
}
void DefaultDnsSocketPool::FillPool(unsigned server_index, unsigned size) {

Powered by Google App Engine
This is Rietveld 408576698