Land Recent QUIC Changes until 03/15/2015.

net/tools/quic/quic_server.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_server.h"
 
 #include <errno.h>
 #ifndef __APPLE__
 // This is a GNU header that is not present in /usr/include on MacOS
 #include <features.h>
 #endif
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/socket.h>
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_crypto_stream.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/quic/quic_dispatcher.h"
 #include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_packet_reader.h"
 #include "net/tools/quic/quic_socket_utils.h"
 
+// TODO(rtenneti): Add support for MMSG_MORE.
 #define MMSG_MORE 0
+// If true, QuicListener uses the QuicPacketReader to read packets instead of
+// QuicServer.
+// TODO(rtenneti): Enable this flag after MMSG_MORE is set to 1.
+#define FLAGS_quic_use_optimized_packet_reader false
 
 #ifndef SO_RXQ_OVFL
 #define SO_RXQ_OVFL 40
 #endif
 
 namespace net {
 namespace tools {
 
 namespace {
 
 const PollBits kEpollFlags = PollBits(NET_POLLIN | NET_POLLOUT | NET_POLLET);
 const char kSourceAddressTokenSecret[] = "secret";
 
 }  // namespace
 
 QuicServer::QuicServer()
     : port_(0),
       fd_(-1),
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
       crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()),
-      supported_versions_(QuicSupportedVersions()) {
+      supported_versions_(QuicSupportedVersions()),
+      packet_reader_(new QuicPacketReader()) {
   Initialize();
 }
 
 QuicServer::QuicServer(const QuicConfig& config,
                        const QuicVersionVector& supported_versions)
     : port_(0),
       fd_(-1),
       packets_dropped_(0),
       overflow_supported_(false),
       use_recvmmsg_(false),
       config_(config),
       crypto_config_(kSourceAddressTokenSecret, QuicRandom::GetInstance()),
-      supported_versions_(supported_versions) {
+      supported_versions_(supported_versions),
+      packet_reader_(new QuicPacketReader()) {
   Initialize();
 }
 
 void QuicServer::Initialize() {
 #if MMSG_MORE
   use_recvmmsg_ = true;
 #endif
 
   // If an initial flow control window has not explicitly been set, then use a
   // sensible value for a server: 1 MB for session, 64 KB for each stream.
@@ skipping 120 matching lines @@
 }
 
 void QuicServer::OnEvent(int fd, EpollEvent* event) {
   DCHECK_EQ(fd, fd_);
   event->out_ready_mask = 0;
 
   if (event->in_events & NET_POLLIN) {
     DVLOG(1) << "NET_POLLIN";
     bool read = true;
     while (read) {
-        read = ReadAndDispatchSinglePacket(
-            fd_, port_, dispatcher_.get(),
-            overflow_supported_ ? &packets_dropped_ : nullptr);
+      if (use_recvmmsg_) {
+        if (FLAGS_quic_use_optimized_packet_reader) {
+          read = packet_reader_->ReadAndDispatchPackets(
+              fd_, port_, dispatcher_.get(),
+              overflow_supported_ ? &packets_dropped_ : nullptr);
+        } else {
+// TODO(rtenneti): Add support for ReadAndDispatchPackets.
+#if 0
+          read = ReadAndDispatchPackets(
+              fd_, port_, dispatcher_.get(),
+              overflow_supported_ ? &packets_dropped_ : nullptr);
+#else
+          read = ReadAndDispatchSinglePacket(
+              fd_, port_, dispatcher_.get(),
+              overflow_supported_ ? &packets_dropped_ : nullptr);
+#endif
+        }
+      } else {
+        if (FLAGS_quic_use_optimized_packet_reader) {
+          read = QuicPacketReader::ReadAndDispatchSinglePacket(
+              fd_, port_, dispatcher_.get(),
+              overflow_supported_ ? &packets_dropped_ : nullptr);
+        } else {
+          read = ReadAndDispatchSinglePacket(
+              fd_, port_, dispatcher_.get(),
+              overflow_supported_ ? &packets_dropped_ : nullptr);
+        }
+      }
     }
   }
   if (event->in_events & NET_POLLOUT) {
     dispatcher_->OnCanWrite();
     if (dispatcher_->HasPendingWrites()) {
       event->out_ready_mask |= NET_POLLOUT;
     }
   }
   if (event->in_events & NET_POLLERR) {
   }
@@ skipping 22 matching lines @@
   QuicEncryptedPacket packet(buf, bytes_read, false);
 
   IPEndPoint server_address(server_ip, port);
   processor->ProcessPacket(server_address, client_address, packet);
 
   return true;
 }
 
 }  // namespace tools
 }  // namespace net