Revert 46757 - Fix IO thread hang on releasing a socket....

net/socket/client_socket_pool_base.cc

 // Copyright (c) 2010 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 "net/socket/client_socket_pool_base.h"
 
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
@@ skipping 99 matching lines @@
 ClientSocketPoolBaseHelper::ClientSocketPoolBaseHelper(
     int max_sockets,
     int max_sockets_per_group,
     base::TimeDelta unused_idle_socket_timeout,
     base::TimeDelta used_idle_socket_timeout,
     ConnectJobFactory* connect_job_factory,
     NetworkChangeNotifier* network_change_notifier)
     : idle_socket_count_(0),
       connecting_socket_count_(0),
       handed_out_socket_count_(0),
-      num_releasing_sockets_(0),
       max_sockets_(max_sockets),
       max_sockets_per_group_(max_sockets_per_group),
       unused_idle_socket_timeout_(unused_idle_socket_timeout),
       used_idle_socket_timeout_(used_idle_socket_timeout),
       may_have_stalled_group_(false),
       connect_job_factory_(connect_job_factory),
       network_change_notifier_(network_change_notifier),
       backup_jobs_enabled_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   DCHECK_LE(0, max_sockets_per_group);
@@ skipping 221 matching lines @@
       }
       return;
     }
   }
 }
 
 void ClientSocketPoolBaseHelper::ReleaseSocket(const std::string& group_name,
                                                ClientSocket* socket) {
   Group& group = group_map_[group_name];
   group.num_releasing_sockets++;
-  num_releasing_sockets_++;
   DCHECK_LE(group.num_releasing_sockets, group.active_socket_count);
   // Run this asynchronously to allow the caller to finish before we let
   // another to begin doing work.  This also avoids nasty recursion issues.
   // NOTE: We cannot refer to the handle argument after this method returns.
   MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
       this, &ClientSocketPoolBaseHelper::DoReleaseSocket, group_name, socket));
 }
 
 void ClientSocketPoolBaseHelper::CloseIdleSockets() {
   CleanupIdleSockets(true);
@@ skipping 104 matching lines @@
 
   group.num_releasing_sockets--;
   DCHECK_GE(group.num_releasing_sockets, 0);
 
   CHECK_GT(handed_out_socket_count_, 0);
   handed_out_socket_count_--;
 
   CHECK_GT(group.active_socket_count, 0);
   group.active_socket_count--;
 
-  CHECK_GT(num_releasing_sockets_, 0);
-  num_releasing_sockets_--;
-
   const bool can_reuse = socket->IsConnectedAndIdle();
   if (can_reuse) {
     AddIdleSocket(socket, true /* used socket */, &group);
   } else {
     delete socket;
   }
 
+  OnAvailableSocketSlot(group_name, &group);
+
   // If there are no more releasing sockets, then we might have to process
   // multiple available socket slots, since we stalled their processing until
-  // all sockets have been released.  Note that ProcessPendingRequest() will
-  // invoke user callbacks, so |num_releasing_sockets_| may change.
-  //
-  // This code has been known to infinite loop.  Set a counter and CHECK to make
-  // sure it doesn't get ridiculously high.
+  // all sockets have been released.
+  i = group_map_.find(group_name);
+  if (i == group_map_.end() || i->second.num_releasing_sockets > 0)
+    return;
 
-  int iterations = 0;
-  while (num_releasing_sockets_ == 0) {
-    CHECK_LT(iterations, 100000) << "Probably stuck in an infinite loop.";
-    std::string top_group_name;
-    Group* top_group = NULL;
-    int stalled_group_count = FindTopStalledGroup(&top_group, &top_group_name);
-    if (stalled_group_count >= 1) {
-      if (ReachedMaxSocketsLimit()) {
-        // We can't activate more sockets since we're already at our global
-        // limit.
-        may_have_stalled_group_ = true;
-        return;
-      }
+  while (true) {
+    // We can't activate more sockets since we're already at our global limit.
+    if (ReachedMaxSocketsLimit())
+      return;
 
-      ProcessPendingRequest(top_group_name, top_group);
-    } else {
-      may_have_stalled_group_ = false;
+    // |group| might now be deleted.
+    i = group_map_.find(group_name);
+    if (i == group_map_.end())
       return;
-    }
 
-    iterations++;
+    group = i->second;
+
+    // If we already have enough ConnectJobs to satisfy the pending requests,
+    // don't bother starting up more.
+    if (group.pending_requests.size() <= group.jobs.size())
+      return;
+
+    if (!group.HasAvailableSocketSlot(max_sockets_per_group_))
+      return;
+
+    OnAvailableSocketSlot(group_name, &group);
   }
 }
 
 // Search for the highest priority pending request, amongst the groups that
 // are not at the |max_sockets_per_group_| limit. Note: for requests with
 // the same priority, the winner is based on group hash ordering (and not
 // insertion order).
 int ClientSocketPoolBaseHelper::FindTopStalledGroup(Group** group,
                                                     std::string* group_name) {
   Group* top_group = NULL;
@@ skipping 101 matching lines @@
       OnAvailableSocketSlot(group_name, &group);
   }
 }
 
 void ClientSocketPoolBaseHelper::OnAvailableSocketSlot(
     const std::string& group_name, Group* group) {
   if (may_have_stalled_group_) {
     std::string top_group_name;
     Group* top_group = NULL;
     int stalled_group_count = FindTopStalledGroup(&top_group, &top_group_name);
-    if (stalled_group_count <= 1 && top_group->num_releasing_sockets == 0)
+    if (stalled_group_count <= 1)
       may_have_stalled_group_ = false;
     if (stalled_group_count >= 1)
       ProcessPendingRequest(top_group_name, top_group);
   } else if (!group->pending_requests.empty()) {
     ProcessPendingRequest(group_name, group);
     // |group| may no longer be valid after this point.  Be careful not to
     // access it again.
   } else if (group->IsEmpty()) {
     // Delete |group| if no longer needed.  |group| will no longer be valid.
     group_map_.erase(group_name);
@@ skipping 82 matching lines @@
   DCHECK_LE(total, max_sockets_);
   if (total < max_sockets_)
     return false;
   LOG(WARNING) << "ReachedMaxSocketsLimit: " << total << "/" << max_sockets_;
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace net