Refactor QuicConnection to use explicit notification for getting onto

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 132 matching lines @@
 }
 
 void QuicDispatcher::Initialize(int fd) {
   DCHECK(writer_ == NULL);
   writer_.reset(CreateWriterWrapper(CreateWriter(fd)));
   time_wait_list_manager_.reset(
       new QuicTimeWaitListManager(writer_.get(), this,
                                   epoll_server(), supported_versions()));
 }
 
-// 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 (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));
-  }
-  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 71 matching lines @@
                                              connection_close_packet);
   session_map_.erase(it);
 }
 
 void QuicDispatcher::DeleteSessions() {
   STLDeleteElements(&closed_session_list_);
 }
 
 bool QuicDispatcher::OnCanWrite() {
   // We got an EPOLLOUT: the socket should not be blocked.
-  SetWritable();
+  writer_->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 (IsWriteBlocked()) {
+    if (writer_->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 31 matching lines @@
   }
   closed_session_list_.push_back(it->second);
   CleanUpSession(it);
 }
 
 void QuicDispatcher::OnWriteBlocked(QuicBlockedWriterInterface* writer) {
   DCHECK(writer_->IsWriteBlocked());
   write_blocked_list_.insert(make_pair(writer, true));
 }
 
-QuicSession* QuicDispatcher::CreateQuicSession(
-    QuicGuid guid,
-    const IPEndPoint& server_address,
-    const IPEndPoint& client_address) {
-  QuicServerSession* session = new QuicServerSession(
-      config_, new QuicConnection(guid, client_address, helper_.get(), this,
-                                  true, supported_versions_), this);
-  session->InitializeSession(crypto_config_);
-  return session;
-}
-
 QuicPacketWriter* QuicDispatcher::CreateWriter(int fd) {
   return new QuicDefaultPacketWriter(fd);
 }
 
 QuicPacketWriterWrapper* QuicDispatcher::CreateWriterWrapper(
     QuicPacketWriter* writer) {
   return new QuicPacketWriterWrapper(writer);
 }
 
+QuicSession* QuicDispatcher::CreateQuicSession(
+    QuicGuid guid,
+    const IPEndPoint& server_address,
+    const IPEndPoint& client_address) {
+  QuicServerSession* session = new QuicServerSession(
+      config_,
+      CreateQuicConnection(guid, server_address, client_address),
+      this);
+  session->InitializeSession(crypto_config_);
+  return session;
+}
+
+QuicConnection* QuicDispatcher::CreateQuicConnection(
+    QuicGuid guid,
+    const IPEndPoint& server_address,
+    const IPEndPoint& client_address) {
+  return new QuicConnection(guid, client_address, helper_.get(), writer_.get(),
+                            true, supported_versions_);
+}
+
 void QuicDispatcher::set_writer(QuicPacketWriter* writer) {
   writer_->set_writer(writer);
 }
 
 bool QuicDispatcher::HandlePacketForTimeWait(
     const QuicPacketPublicHeader& header) {
   if (header.reset_flag) {
     // Public reset packets do not have sequence numbers, so ignore the packet.
     return false;
   }
 
   // Switch the framer to the correct version, so that the sequence number can
   // be parsed correctly.
   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