commit 34bacf1945a7dbcd816cd7867c7aafa1ebd1bd39
author dschinazi <dschinazi@google.com> Mon Mar 01 10:25:48 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Mar 01 10:26:47 2021 -0800
tree b8492e274dad4e400e7c0118471edd356eaafc25
parent 99dd538715414134b9969ce2bddb4022948d6e01

Fix masque_server and epoll_quic_server in Chrome

Without this change, these two test servers crash when run
from Chromium. They are not used in production.

PiperOrigin-RevId: 360221475
Change-Id: I2628a738e34fcc9797c8d1ef30ea785964cfc308

quic/masque/masque_server_bin.cc

diff --git a/quic/masque/masque_server_bin.cc b/quic/masque/masque_server_bin.cc
index 17fee23..d5a5d9f 100644
--- a/quic/masque/masque_server_bin.cc
+++ b/quic/masque/masque_server_bin.cc
@@ -14,6 +14,7 @@
 #include "quic/platform/api/quic_flags.h"
 #include "quic/platform/api/quic_logging.h"
 #include "quic/platform/api/quic_socket_address.h"
+#include "quic/platform/api/quic_system_event_loop.h"
 
 DEFINE_QUIC_COMMAND_LINE_FLAG(int32_t,
                               port,
@@ -42,6 +43,7 @@
                               "open and legacy. Defaults to open.");
 
 int main(int argc, char* argv[]) {
+  QuicSystemEventLoop event_loop("masque_server");
   const char* usage = "Usage: masque_server [options]";
   std::vector<std::string> non_option_args =
       quic::QuicParseCommandLineFlags(usage, argc, argv);

quic/tools/quic_server_bin.cc

diff --git a/quic/tools/quic_server_bin.cc b/quic/tools/quic_server_bin.cc
index 6ed8e99..c971367 100644
--- a/quic/tools/quic_server_bin.cc
+++ b/quic/tools/quic_server_bin.cc
@@ -9,10 +9,12 @@
 
 #include "quic/core/quic_versions.h"
 #include "quic/platform/api/quic_flags.h"
+#include "quic/platform/api/quic_system_event_loop.h"
 #include "quic/tools/quic_epoll_server_factory.h"
 #include "quic/tools/quic_toy_server.h"
 
 int main(int argc, char* argv[]) {
+  QuicSystemEventLoop event_loop("quic_server");
   const char* usage = "Usage: quic_server [options]";
   std::vector<std::string> non_option_args =
       quic::QuicParseCommandLineFlags(usage, argc, argv);