Landing Recent QUIC changes until 5:55 PM, Aug 25, 2016 UTC-4

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>
 #include <features.h>
 #include <netinet/in.h>
 #include <string.h>
@@ skipping 30 matching lines @@
 // Specifies the directory used during QuicInMemoryCache
 // construction to seed the cache. Cache directory can be
 // generated using `wget -p --save-headers <url>`
 std::string FLAGS_quic_in_memory_cache_dir = "";
 
 const int kEpollFlags = EPOLLIN | EPOLLOUT | EPOLLET;
 const char kSourceAddressTokenSecret[] = "secret";
 
 }  // namespace
 
+const size_t kNumSessionsToCreatePerSocketEvent = 16;
+
 QuicServer::QuicServer(std::unique_ptr<ProofSource> proof_source)
     : QuicServer(std::move(proof_source),
                  QuicConfig(),
                  QuicCryptoServerConfig::ConfigOptions(),
                  AllSupportedVersions()) {}
 
 QuicServer::QuicServer(
     std::unique_ptr<ProofSource> proof_source,
     const QuicConfig& config,
     const QuicCryptoServerConfig::ConfigOptions& crypto_config_options,
@@ skipping 109 matching lines @@
   close(fd_);
   fd_ = -1;
 }
 
 void QuicServer::OnEvent(int fd, EpollEvent* event) {
   DCHECK_EQ(fd, fd_);
   event->out_ready_mask = 0;
 
   if (event->in_events & EPOLLIN) {
     DVLOG(1) << "EPOLLIN";
+
+    if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
+        FLAGS_quic_buffer_packet_till_chlo) {
+      dispatcher_->ProcessBufferedChlos(kNumSessionsToCreatePerSocketEvent);
+    }
+
     bool more_to_read = true;
     while (more_to_read) {
       more_to_read = packet_reader_->ReadAndDispatchPackets(
           fd_, port_, false /* potentially_small_mtu */,
           QuicEpollClock(&epoll_server_), dispatcher_.get(),
           overflow_supported_ ? &packets_dropped_ : nullptr);
     }
+
+    if (FLAGS_quic_limit_num_new_sessions_per_epoll_loop &&
+        FLAGS_quic_buffer_packet_till_chlo && dispatcher_->HasChlosBuffered()) {
+      // Register EPOLLIN event to consume buffered CHLO(s).
+      event->out_ready_mask |= EPOLLIN;
+    }
   }
   if (event->in_events & EPOLLOUT) {
     dispatcher_->OnCanWrite();
     if (dispatcher_->HasPendingWrites()) {
       event->out_ready_mask |= EPOLLOUT;
     }
   }
   if (event->in_events & EPOLLERR) {
   }
 }
 
 }  // namespace net