Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.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/tools/quic/quic_dispatcher.h"
 
 #include <errno.h>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 114 matching lines @@
                                const QuicVersionVector& supported_versions,
                                int fd,
                                EpollServer* epoll_server)
     : config_(config),
       crypto_config_(crypto_config),
       time_wait_list_manager_(
           new QuicTimeWaitListManager(this, epoll_server, supported_versions)),
       delete_sessions_alarm_(new DeleteSessionsAlarm(this)),
       epoll_server_(epoll_server),
       fd_(fd),
-      write_blocked_(false),
       helper_(new QuicEpollConnectionHelper(epoll_server_)),
       writer_(new QuicDefaultPacketWriter(fd)),
       supported_versions_(supported_versions),
       current_packet_(NULL),
       framer_(supported_versions, /*unused*/ QuicTime::Zero(), true),
       framer_visitor_(new QuicFramerVisitor(this)) {
   framer_.set_visitor(framer_visitor_.get());
 }
 
 QuicDispatcher::~QuicDispatcher() {
   STLDeleteValues(&session_map_);
   STLDeleteElements(&closed_session_list_);
 }
 
 void QuicDispatcher::set_fd(int fd) {
   fd_ = fd;
   writer_.reset(new QuicDefaultPacketWriter(fd));
 }
 
+// TODO(fnk): remove the Writer interface implementation in favor of
+// direct requests for blocked list placement from Connection/Session.
 WriteResult QuicDispatcher::WritePacket(const char* buffer, size_t buf_len,
                                         const IPAddressNumber& self_address,
                                         const IPEndPoint& peer_address,
                                         QuicBlockedWriterInterface* writer) {
-  if (write_blocked_) {
+  if (IsWriteBlocked()) {
     write_blocked_list_.insert(make_pair(writer, true));
     return WriteResult(WRITE_STATUS_BLOCKED, EAGAIN);
   }
 
   WriteResult result =
       writer_->WritePacket(buffer, buf_len, self_address, peer_address, writer);
   if (result.status == WRITE_STATUS_BLOCKED) {
+    DCHECK(IsWriteBlocked());
     write_blocked_list_.insert(make_pair(writer, true));
-    write_blocked_ = true;
   }
   return result;
 }
 
 bool QuicDispatcher::IsWriteBlockedDataBuffered() const {
   return writer_->IsWriteBlockedDataBuffered();
 }
 
+bool QuicDispatcher::IsWriteBlocked() const {
+  return writer_->IsWriteBlocked();
+}
+
+void QuicDispatcher::SetWritable() {
+  writer_->SetWritable();
+}
+
 void QuicDispatcher::ProcessPacket(const IPEndPoint& server_address,
                                    const IPEndPoint& client_address,
                                    const QuicEncryptedPacket& packet) {
   current_server_address_ = server_address;
   current_client_address_ = client_address;
   current_packet_ = &packet;
   // ProcessPacket will cause the packet to be dispatched in
   // OnUnauthenticatedPublicHeader, or sent to the time wait list manager
   // in OnAuthenticatedHeader.
   framer_.ProcessPacket(packet);
@@ skipping 69 matching lines @@
   time_wait_list_manager_->AddGuidToTimeWait(it->first,
                                              connection->version(),
                                              connection_close_packet);
   session_map_.erase(it);
 }
 
 void QuicDispatcher::DeleteSessions() {
   STLDeleteElements(&closed_session_list_);
 }
 
-void QuicDispatcher::UseWriter(QuicPacketWriter* writer) {
-  writer_.reset(writer);
-}
-
 bool QuicDispatcher::OnCanWrite() {
   // We got an EPOLLOUT: the socket should not be blocked.
-  write_blocked_ = false;
+  SetWritable();
 
   // Give each writer one attempt to write.
   int num_writers = write_blocked_list_.size();
   for (int i = 0; i < num_writers; ++i) {
     if (write_blocked_list_.empty()) {
       break;
     }
     QuicBlockedWriterInterface* writer = write_blocked_list_.begin()->first;
     write_blocked_list_.erase(write_blocked_list_.begin());
     bool can_write_more = writer->OnCanWrite();
-    if (write_blocked_) {
+    if (IsWriteBlocked()) {
       // We were unable to write.  Wait for the next EPOLLOUT.
       // In this case, the session would have been added to the blocked list
       // up in WritePacket.
       return false;
     }
     // The socket is not blocked but the writer has ceded work.  Add it to the
     // end of the list.
     if (can_write_more) {
       write_blocked_list_.insert(make_pair(writer, true));
     }
@@ skipping 56 matching lines @@
   framer_.set_version(time_wait_list_manager_->GetQuicVersionFromGuid(
       header.guid));
 
   // Continue parsing the packet to extract the sequence number.  Then
   // send it to the time wait manager in OnUnathenticatedHeader.
   return true;
 }
 
 }  // namespace tools
 }  // namespace net