Move quic_system_event_loop to quiche/common/platform/default. Also move QuicheSystemEventLoop and QuicheRunSystemEventLoopIteration from the top level namespace. PiperOrigin-RevId: 434910863
diff --git a/common/platform/api/quiche_system_event_loop.h b/common/platform/api/quiche_system_event_loop.h new file mode 100644 index 0000000..41ed45a --- /dev/null +++ b/common/platform/api/quiche_system_event_loop.h
@@ -0,0 +1,20 @@ +// Copyright (c) 2019 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. + +#ifndef QUICHE_COMMON_PLATFORM_API_QUICHE_SYSTEM_EVENT_LOOP_H_ +#define QUICHE_COMMON_PLATFORM_API_QUICHE_SYSTEM_EVENT_LOOP_H_ + +#include "quiche_platform_impl/quiche_system_event_loop_impl.h" + +namespace quiche { + +inline void QuicheRunSystemEventLoopIteration() { + QuicheRunSystemEventLoopIterationImpl(); +} + +using QuicheSystemEventLoop = QuicheSystemEventLoopImpl; + +} // namespace quiche + +#endif // QUICHE_COMMON_PLATFORM_API_QUICHE_SYSTEM_EVENT_LOOP_H_
diff --git a/common/platform/default/quiche_platform_impl/quiche_system_event_loop_impl.h b/common/platform/default/quiche_platform_impl/quiche_system_event_loop_impl.h new file mode 100644 index 0000000..8ba419e --- /dev/null +++ b/common/platform/default/quiche_platform_impl/quiche_system_event_loop_impl.h
@@ -0,0 +1,24 @@ +// Copyright 2022 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. + +#ifndef QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_SYSTEM_EVENT_LOOP_IMPL_H_ +#define QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_SYSTEM_EVENT_LOOP_IMPL_H_ + +#include "common/platform/api/quiche_export.h" +#include "common/platform/api/quiche_logging.h" + +namespace quiche { + +inline void QuicheRunSystemEventLoopIterationImpl() {} + +class QUICHE_EXPORT_PRIVATE QuicheSystemEventLoopImpl { + public: + QuicheSystemEventLoopImpl(std::string context_name) { + QUICHE_LOG(INFO) << "Starting event loop for " << context_name; + } +}; + +} // namespace quiche + +#endif // QUICHE_COMMON_PLATFORM_DEFAULT_QUICHE_PLATFORM_IMPL_QUICHE_SYSTEM_EVENT_LOOP_IMPL_H_
diff --git a/quic/masque/masque_client_bin.cc b/quic/masque/masque_client_bin.cc index fb6a61d..294ba4e 100644 --- a/quic/masque/masque_client_bin.cc +++ b/quic/masque/masque_client_bin.cc
@@ -21,9 +21,9 @@ #include "quic/platform/api/quic_default_proof_providers.h" #include "quic/platform/api/quic_flags.h" #include "quic/platform/api/quic_socket_address.h" -#include "quic/platform/api/quic_system_event_loop.h" #include "quic/tools/fake_proof_verifier.h" #include "common/platform/api/quiche_command_line_flags.h" +#include "common/platform/api/quiche_system_event_loop.h" DEFINE_QUICHE_COMMAND_LINE_FLAG( bool, disable_certificate_verification, false, @@ -38,7 +38,7 @@ namespace { int RunMasqueClient(int argc, char* argv[]) { - QuicSystemEventLoop event_loop("masque_client"); + quiche::QuicheSystemEventLoop event_loop("masque_client"); const char* usage = "Usage: masque_client [options] <url>"; // The first non-flag argument is the URI template of the MASQUE server.
diff --git a/quic/masque/masque_server_bin.cc b/quic/masque/masque_server_bin.cc index 666f67f..0a66938 100644 --- a/quic/masque/masque_server_bin.cc +++ b/quic/masque/masque_server_bin.cc
@@ -14,8 +14,8 @@ #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" #include "common/platform/api/quiche_command_line_flags.h" +#include "common/platform/api/quiche_system_event_loop.h" DEFINE_QUICHE_COMMAND_LINE_FLAG(int32_t, port, 9661, "The port the MASQUE server will listen on."); @@ -36,7 +36,7 @@ "open and legacy. Defaults to open."); int main(int argc, char* argv[]) { - QuicSystemEventLoop event_loop("masque_server"); + quiche::QuicheSystemEventLoop event_loop("masque_server"); const char* usage = "Usage: masque_server [options]"; std::vector<std::string> non_option_args = quiche::QuicheParseCommandLineFlags(usage, argc, argv);
diff --git a/quic/platform/api/quic_system_event_loop.h b/quic/platform/api/quic_system_event_loop.h deleted file mode 100644 index 3103d4e..0000000 --- a/quic/platform/api/quic_system_event_loop.h +++ /dev/null
@@ -1,16 +0,0 @@ -// Copyright (c) 2019 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. - -#ifndef QUICHE_QUIC_PLATFORM_API_QUIC_SYSTEM_EVENT_LOOP_H_ -#define QUICHE_QUIC_PLATFORM_API_QUIC_SYSTEM_EVENT_LOOP_H_ - -#include "net/quic/platform/impl/quic_system_event_loop_impl.h" - -inline void QuicRunSystemEventLoopIteration() { - QuicRunSystemEventLoopIterationImpl(); -} - -using QuicSystemEventLoop = QuicSystemEventLoopImpl; - -#endif // QUICHE_QUIC_PLATFORM_API_QUIC_SYSTEM_EVENT_LOOP_H_
diff --git a/quic/tools/quic_client_bin.cc b/quic/tools/quic_client_bin.cc index deedddd..1efc0e0 100644 --- a/quic/tools/quic_client_bin.cc +++ b/quic/tools/quic_client_bin.cc
@@ -44,13 +44,13 @@ #include <memory> #include <string> -#include "quic/platform/api/quic_system_event_loop.h" #include "quic/tools/quic_epoll_client_factory.h" #include "quic/tools/quic_toy_client.h" #include "common/platform/api/quiche_command_line_flags.h" +#include "common/platform/api/quiche_system_event_loop.h" int main(int argc, char* argv[]) { - QuicSystemEventLoop event_loop("quic_client"); + quiche::QuicheSystemEventLoop event_loop("quic_client"); const char* usage = "Usage: quic_client [options] <url>"; // All non-flag arguments should be interpreted as URLs to fetch.
diff --git a/quic/tools/quic_client_epoll_network_helper.cc b/quic/tools/quic_client_epoll_network_helper.cc index 9dcc2b3..bd184ab 100644 --- a/quic/tools/quic_client_epoll_network_helper.cc +++ b/quic/tools/quic_client_epoll_network_helper.cc
@@ -22,7 +22,7 @@ #include "quic/core/quic_udp_socket.h" #include "quic/platform/api/quic_bug_tracker.h" #include "quic/platform/api/quic_logging.h" -#include "quic/platform/api/quic_system_event_loop.h" +#include "common/platform/api/quiche_system_event_loop.h" namespace quic { @@ -132,7 +132,7 @@ } void QuicClientEpollNetworkHelper::RunEventLoop() { - QuicRunSystemEventLoopIteration(); + quiche::QuicheRunSystemEventLoopIteration(); epoll_server_->WaitForEventsAndExecuteCallbacks(); }
diff --git a/quic/tools/quic_client_interop_test_bin.cc b/quic/tools/quic_client_interop_test_bin.cc index 5dcd95c..7411e12 100644 --- a/quic/tools/quic_client_interop_test_bin.cc +++ b/quic/tools/quic_client_interop_test_bin.cc
@@ -13,13 +13,13 @@ #include "quic/core/quic_types.h" #include "quic/core/quic_versions.h" #include "quic/platform/api/quic_epoll.h" -#include "quic/platform/api/quic_system_event_loop.h" #include "quic/test_tools/quic_connection_peer.h" #include "quic/test_tools/quic_session_peer.h" #include "quic/tools/fake_proof_verifier.h" #include "quic/tools/quic_client.h" #include "quic/tools/quic_url.h" #include "common/platform/api/quiche_command_line_flags.h" +#include "common/platform/api/quiche_system_event_loop.h" DEFINE_QUICHE_COMMAND_LINE_FLAG(std::string, host, "", "The IP or hostname to connect to."); @@ -396,7 +396,7 @@ } // namespace quic int main(int argc, char* argv[]) { - QuicSystemEventLoop event_loop("quic_client"); + quiche::QuicheSystemEventLoop event_loop("quic_client"); const char* usage = "Usage: quic_client_interop_test [options] [url]"; std::vector<std::string> args =
diff --git a/quic/tools/quic_server_bin.cc b/quic/tools/quic_server_bin.cc index 5d3ed72..7ddfe18 100644 --- a/quic/tools/quic_server_bin.cc +++ b/quic/tools/quic_server_bin.cc
@@ -9,13 +9,13 @@ #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" #include "common/platform/api/quiche_command_line_flags.h" +#include "common/platform/api/quiche_system_event_loop.h" int main(int argc, char* argv[]) { - QuicSystemEventLoop event_loop("quic_server"); + quiche::QuicheSystemEventLoop event_loop("quic_server"); const char* usage = "Usage: quic_server [options]"; std::vector<std::string> non_option_args = quiche::QuicheParseCommandLineFlags(usage, argc, argv);
diff --git a/quic/tools/quic_toy_client.cc b/quic/tools/quic_toy_client.cc index c033fd8..08d9a67 100644 --- a/quic/tools/quic_toy_client.cc +++ b/quic/tools/quic_toy_client.cc
@@ -60,7 +60,6 @@ #include "quic/platform/api/quic_default_proof_providers.h" #include "quic/platform/api/quic_ip_address.h" #include "quic/platform/api/quic_socket_address.h" -#include "quic/platform/api/quic_system_event_loop.h" #include "quic/tools/fake_proof_verifier.h" #include "quic/tools/quic_url.h" #include "common/platform/api/quiche_command_line_flags.h"