When an idle socket is added back to a socket pool, check for stalled jobs in lower pools

net/spdy/spdy_session.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 "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 486 matching lines @@
 #endif
 
   net_log_.AddEvent(
       NetLog::TYPE_SPDY_SESSION_INITIALIZED,
       connection_->socket()->NetLog().source().ToEventParametersCallback());
 
   int error = DoLoop(OK);
   if (error == ERR_IO_PENDING)
     error = OK;
   if (error == OK) {
-    connection_->AddLayeredPool(this);
+    connection_->AddHigherLayeredPool(this);
     SendInitialSettings();
     // Write out any data that we might have to send, such as the
     // settings frame.
     WriteSocketLater();
     spdy_session_pool_ = spdy_session_pool;
   }
   return static_cast<Error>(error);
 }
 
 bool SpdySession::VerifyDomainAuthentication(const std::string& domain) {
@@ skipping 473 matching lines @@
         unclaimed_pushed_streams_.erase(it2);
         break;
       }
     }
   }
 
   scoped_ptr<SpdyStream> owned_stream(it->second.stream);
   active_streams_.erase(it);
 
   DeleteStream(owned_stream.Pass(), status);
+
+  // If there are no active streams, and the socket pool is stalled, try to free
+  // up a socket slot.
+  if (active_streams_.empty() && connection_->IsPoolStalled())
+    RemoveFromPool();

[Ryan Hamilton, 2013/07/21 14:53:54]

akalin has been refactoring SpdySession quite a bit recently.  You might need to
rebase, I'm not sure.

[mmenke, 2013/07/22 20:13:33]

Yea, this completely doesn't work now.  Removing from the pool now deletes the
session, but a lot of methods run code after CloseActiveStreamIterator.

I'll have to get a better understanding of SpdySessions to figure out how to
update the CL.

 }
 
 void SpdySession::CloseCreatedStreamIterator(CreatedStreamSet::iterator it,
                                              int status) {
   scoped_ptr<SpdyStream> owned_stream(*it);
   created_streams_.erase(it);
   DeleteStream(owned_stream.Pass(), status);
 }
 
 void SpdySession::ResetStreamIterator(ActiveStreamMap::iterator it,
@@ skipping 1591 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net