Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/tools/quic/test_tools/server_thread.cc

 // Copyright 2013 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/test_tools/server_thread.h"
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/tools/quic/quic_dispatcher.h"
 #include "net/tools/quic/test_tools/quic_server_peer.h"
 
@@ skipping 43 matching lines @@
   if (!initialized_) {
     Initialize();
   }
 
   while (!quit_.IsSignaled()) {
     if (pause_.IsSignaled() && !resume_.IsSignaled()) {
       paused_.Signal();
       resume_.Wait();
     }
     server_->WaitForEvents();
+    ExecuteScheduledActions();
     MaybeNotifyOfHandshakeConfirmation();
   }
 
   server_->Shutdown();
 }
 
 int ServerThread::GetPort() {
   port_lock_.Acquire();
   int rc = port_;
   port_lock_.Release();
   return rc;
 }
 
+void ServerThread::Schedule(std::function<void()> action) {
+  DCHECK(!quit_.IsSignaled());
+  base::AutoLock lock(scheduled_actions_lock_);
+  scheduled_actions_.push_back(std::move(action));
+}
+
 void ServerThread::WaitForCryptoHandshakeConfirmed() {
   confirmed_.Wait();
 }
 
 void ServerThread::Pause() {
   DCHECK(!pause_.IsSignaled());
   pause_.Signal();
   paused_.Wait();
 }
 
@@ skipping 19 matching lines @@
   if (dispatcher->session_map().empty()) {
     // Wait for a session to be created.
     return;
   }
   QuicSession* session = dispatcher->session_map().begin()->second;
   if (session->IsCryptoHandshakeConfirmed()) {
     confirmed_.Signal();
   }
 }
 
+void ServerThread::ExecuteScheduledActions() {
+  std::deque<std::function<void()>> actions;
+  {
+    base::AutoLock lock(scheduled_actions_lock_);
+    actions.swap(scheduled_actions_);
+  }
+  while (!actions.empty()) {
+    actions.front()();
+    actions.pop_front();
+  }
+}
+
 }  // namespace test
 }  // namespace net