Rename QuicDefaultEventLoop to QuicPollEventLoop. This better reflects what the class actually does, and I am working on code that lets us override the default via a platform API, making this name inaccurate. PiperOrigin-RevId: 456834349
diff --git a/build/source_list.bzl b/build/source_list.bzl index aaf08ad..4d1ff62 100644 --- a/build/source_list.bzl +++ b/build/source_list.bzl
@@ -932,8 +932,8 @@ "quic/core/batch_writer/quic_batch_writer_test.h", "quic/core/batch_writer/quic_gso_batch_writer.h", "quic/core/batch_writer/quic_sendmmsg_batch_writer.h", - "quic/core/io/quic_default_event_loop.h", "quic/core/io/quic_event_loop.h", + "quic/core/io/quic_poll_event_loop.h", "quic/core/quic_default_packet_writer.h", "quic/core/quic_epoll_alarm_factory.h", "quic/core/quic_epoll_clock.h", @@ -964,7 +964,7 @@ "quic/core/batch_writer/quic_batch_writer_buffer.cc", "quic/core/batch_writer/quic_gso_batch_writer.cc", "quic/core/batch_writer/quic_sendmmsg_batch_writer.cc", - "quic/core/io/quic_default_event_loop.cc", + "quic/core/io/quic_poll_event_loop.cc", "quic/core/quic_default_packet_writer.cc", "quic/core/quic_epoll_alarm_factory.cc", "quic/core/quic_epoll_clock.cc", @@ -1278,7 +1278,7 @@ "quic/core/http/quic_spdy_client_session_test.cc", "quic/core/http/quic_spdy_client_stream_test.cc", "quic/core/http/quic_spdy_server_stream_base_test.cc", - "quic/core/io/quic_default_event_loop_test.cc", + "quic/core/io/quic_poll_event_loop_test.cc", "quic/core/quic_epoll_alarm_factory_test.cc", "quic/core/quic_epoll_clock_test.cc", "quic/core/quic_epoll_connection_helper_test.cc",
diff --git a/build/source_list.gni b/build/source_list.gni index fcc9576..8658d49 100644 --- a/build/source_list.gni +++ b/build/source_list.gni
@@ -932,8 +932,8 @@ "src/quiche/quic/core/batch_writer/quic_batch_writer_test.h", "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.h", "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h", - "src/quiche/quic/core/io/quic_default_event_loop.h", "src/quiche/quic/core/io/quic_event_loop.h", + "src/quiche/quic/core/io/quic_poll_event_loop.h", "src/quiche/quic/core/quic_default_packet_writer.h", "src/quiche/quic/core/quic_epoll_alarm_factory.h", "src/quiche/quic/core/quic_epoll_clock.h", @@ -964,7 +964,7 @@ "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc", "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.cc", "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc", - "src/quiche/quic/core/io/quic_default_event_loop.cc", + "src/quiche/quic/core/io/quic_poll_event_loop.cc", "src/quiche/quic/core/quic_default_packet_writer.cc", "src/quiche/quic/core/quic_epoll_alarm_factory.cc", "src/quiche/quic/core/quic_epoll_clock.cc", @@ -1278,7 +1278,7 @@ "src/quiche/quic/core/http/quic_spdy_client_session_test.cc", "src/quiche/quic/core/http/quic_spdy_client_stream_test.cc", "src/quiche/quic/core/http/quic_spdy_server_stream_base_test.cc", - "src/quiche/quic/core/io/quic_default_event_loop_test.cc", + "src/quiche/quic/core/io/quic_poll_event_loop_test.cc", "src/quiche/quic/core/quic_epoll_alarm_factory_test.cc", "src/quiche/quic/core/quic_epoll_clock_test.cc", "src/quiche/quic/core/quic_epoll_connection_helper_test.cc",
diff --git a/build/source_list.json b/build/source_list.json index 8ad5c07..cca88cb 100644 --- a/build/source_list.json +++ b/build/source_list.json
@@ -931,8 +931,8 @@ "quiche/quic/core/batch_writer/quic_batch_writer_test.h", "quiche/quic/core/batch_writer/quic_gso_batch_writer.h", "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h", - "quiche/quic/core/io/quic_default_event_loop.h", "quiche/quic/core/io/quic_event_loop.h", + "quiche/quic/core/io/quic_poll_event_loop.h", "quiche/quic/core/quic_default_packet_writer.h", "quiche/quic/core/quic_epoll_alarm_factory.h", "quiche/quic/core/quic_epoll_clock.h", @@ -963,7 +963,7 @@ "quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc", "quiche/quic/core/batch_writer/quic_gso_batch_writer.cc", "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc", - "quiche/quic/core/io/quic_default_event_loop.cc", + "quiche/quic/core/io/quic_poll_event_loop.cc", "quiche/quic/core/quic_default_packet_writer.cc", "quiche/quic/core/quic_epoll_alarm_factory.cc", "quiche/quic/core/quic_epoll_clock.cc", @@ -1277,7 +1277,7 @@ "quiche/quic/core/http/quic_spdy_client_session_test.cc", "quiche/quic/core/http/quic_spdy_client_stream_test.cc", "quiche/quic/core/http/quic_spdy_server_stream_base_test.cc", - "quiche/quic/core/io/quic_default_event_loop_test.cc", + "quiche/quic/core/io/quic_poll_event_loop_test.cc", "quiche/quic/core/quic_epoll_alarm_factory_test.cc", "quiche/quic/core/quic_epoll_clock_test.cc", "quiche/quic/core/quic_epoll_connection_helper_test.cc",
diff --git a/quiche/quic/core/io/quic_default_event_loop.cc b/quiche/quic/core/io/quic_poll_event_loop.cc similarity index 79% rename from quiche/quic/core/io/quic_default_event_loop.cc rename to quiche/quic/core/io/quic_poll_event_loop.cc index bd7be5a..f7a9794 100644 --- a/quiche/quic/core/io/quic_default_event_loop.cc +++ b/quiche/quic/core/io/quic_poll_event_loop.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "quiche/quic/core/io/quic_default_event_loop.h" +#include "quiche/quic/core/io/quic_poll_event_loop.h" #include <poll.h> @@ -36,12 +36,12 @@ } // namespace -QuicDefaultEventLoop::QuicDefaultEventLoop(QuicClock* clock) +QuicPollEventLoop::QuicPollEventLoop(QuicClock* clock) : clock_(clock), alarm_factory_(this) {} -bool QuicDefaultEventLoop::RegisterSocket(QuicUdpSocketFd fd, - QuicSocketEventMask events, - QuicSocketEventListener* listener) { +bool QuicPollEventLoop::RegisterSocket(QuicUdpSocketFd fd, + QuicSocketEventMask events, + QuicSocketEventListener* listener) { auto [it, success] = registrations_.insert({fd, std::make_shared<Registration>()}); if (!success) { @@ -53,12 +53,12 @@ return true; } -bool QuicDefaultEventLoop::UnregisterSocket(QuicUdpSocketFd fd) { +bool QuicPollEventLoop::UnregisterSocket(QuicUdpSocketFd fd) { return registrations_.erase(fd); } -bool QuicDefaultEventLoop::RearmSocket(QuicUdpSocketFd fd, - QuicSocketEventMask events) { +bool QuicPollEventLoop::RearmSocket(QuicUdpSocketFd fd, + QuicSocketEventMask events) { auto it = registrations_.find(fd); if (it == registrations_.end()) { return false; @@ -67,8 +67,8 @@ return true; } -bool QuicDefaultEventLoop::ArtificiallyNotifyEvent(QuicUdpSocketFd fd, - QuicSocketEventMask events) { +bool QuicPollEventLoop::ArtificiallyNotifyEvent(QuicUdpSocketFd fd, + QuicSocketEventMask events) { auto it = registrations_.find(fd); if (it == registrations_.end()) { return false; @@ -78,7 +78,7 @@ return true; } -void QuicDefaultEventLoop::RunEventLoopOnce(QuicTime::Delta default_timeout) { +void QuicPollEventLoop::RunEventLoopOnce(QuicTime::Delta default_timeout) { const QuicTime start_time = clock_->Now(); ProcessAlarmsUpTo(start_time); @@ -89,7 +89,7 @@ ProcessAlarmsUpTo(end_time); } -QuicTime::Delta QuicDefaultEventLoop::ComputePollTimeout( +QuicTime::Delta QuicPollEventLoop::ComputePollTimeout( QuicTime now, QuicTime::Delta default_timeout) const { if (has_artificial_events_pending_) { return QuicTime::Delta::Zero(); @@ -109,9 +109,9 @@ return end_time - now; } -int QuicDefaultEventLoop::PollWithRetries(absl::Span<pollfd> fds, - QuicTime start_time, - QuicTime::Delta timeout) { +int QuicPollEventLoop::PollWithRetries(absl::Span<pollfd> fds, + QuicTime start_time, + QuicTime::Delta timeout) { const QuicTime timeout_at = start_time + timeout; int poll_result; for (;;) { @@ -133,8 +133,8 @@ return poll_result; } -void QuicDefaultEventLoop::ProcessIoEvents(QuicTime start_time, - QuicTime::Delta timeout) { +void QuicPollEventLoop::ProcessIoEvents(QuicTime start_time, + QuicTime::Delta timeout) { // Set up the pollfd[] array. const size_t registration_count = registrations_.size(); auto pollfds = std::make_unique<pollfd[]>(registration_count); @@ -169,9 +169,8 @@ RunReadyCallbacks(ready_list); } -void QuicDefaultEventLoop::DispatchIoEvent( - std::vector<ReadyListEntry>& ready_list, QuicUdpSocketFd fd, - PollMask mask) { +void QuicPollEventLoop::DispatchIoEvent(std::vector<ReadyListEntry>& ready_list, + QuicUdpSocketFd fd, PollMask mask) { auto it = registrations_.find(fd); if (it == registrations_.end()) { QUIC_BUG(poll returned an unregistered fd) << fd; @@ -192,7 +191,7 @@ registration.events &= ~GetEventMask(mask); } -void QuicDefaultEventLoop::RunReadyCallbacks( +void QuicPollEventLoop::RunReadyCallbacks( std::vector<ReadyListEntry>& ready_list) { for (ReadyListEntry& entry : ready_list) { std::shared_ptr<Registration> registration = entry.registration.lock(); @@ -205,7 +204,7 @@ ready_list.clear(); } -void QuicDefaultEventLoop::ProcessAlarmsUpTo(QuicTime time) { +void QuicPollEventLoop::ProcessAlarmsUpTo(QuicTime time) { // Determine which alarm callbacks needs to be run. std::vector<std::weak_ptr<Alarm*>> alarms_to_call; while (!alarms_.empty() && alarms_.begin()->first <= time) { @@ -232,12 +231,12 @@ } } -QuicAlarm* QuicDefaultEventLoop::AlarmFactory::CreateAlarm( +QuicAlarm* QuicPollEventLoop::AlarmFactory::CreateAlarm( QuicAlarm::Delegate* delegate) { return new Alarm(loop_, QuicArenaScopedPtr<QuicAlarm::Delegate>(delegate)); } -QuicArenaScopedPtr<QuicAlarm> QuicDefaultEventLoop::AlarmFactory::CreateAlarm( +QuicArenaScopedPtr<QuicAlarm> QuicPollEventLoop::AlarmFactory::CreateAlarm( QuicArenaScopedPtr<QuicAlarm::Delegate> delegate, QuicConnectionArena* arena) { if (arena != nullptr) { @@ -246,21 +245,20 @@ return QuicArenaScopedPtr<QuicAlarm>(new Alarm(loop_, std::move(delegate))); } -QuicDefaultEventLoop::Alarm::Alarm( - QuicDefaultEventLoop* loop, - QuicArenaScopedPtr<QuicAlarm::Delegate> delegate) +QuicPollEventLoop::Alarm::Alarm( + QuicPollEventLoop* loop, QuicArenaScopedPtr<QuicAlarm::Delegate> delegate) : QuicAlarm(std::move(delegate)), loop_(loop) {} -void QuicDefaultEventLoop::Alarm::SetImpl() { +void QuicPollEventLoop::Alarm::SetImpl() { current_schedule_handle_ = std::make_shared<Alarm*>(this); loop_->alarms_.insert({deadline(), current_schedule_handle_}); } -void QuicDefaultEventLoop::Alarm::CancelImpl() { +void QuicPollEventLoop::Alarm::CancelImpl() { current_schedule_handle_.reset(); } -QuicAlarmFactory* QuicDefaultEventLoop::GetAlarmFactory() { +QuicAlarmFactory* QuicPollEventLoop::GetAlarmFactory() { return &alarm_factory_; }
diff --git a/quiche/quic/core/io/quic_default_event_loop.h b/quiche/quic/core/io/quic_poll_event_loop.h similarity index 91% rename from quiche/quic/core/io/quic_default_event_loop.h rename to quiche/quic/core/io/quic_poll_event_loop.h index ca2a958..1764918 100644 --- a/quiche/quic/core/io/quic_default_event_loop.h +++ b/quiche/quic/core/io/quic_poll_event_loop.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef QUICHE_QUIC_CORE_IO_QUIC_DEFAULT_EVENT_LOOP_H_ -#define QUICHE_QUIC_CORE_IO_QUIC_DEFAULT_EVENT_LOOP_H_ +#ifndef QUICHE_QUIC_CORE_IO_QUIC_POLL_EVENT_LOOP_H_ +#define QUICHE_QUIC_CORE_IO_QUIC_POLL_EVENT_LOOP_H_ #include <poll.h> @@ -35,9 +35,9 @@ // processing, when all of the state for the event loop is consistent. // 2. The callbacks are stored as weak pointers, since other callbacks can // cause them to be unregistered. -class QUICHE_NO_EXPORT QuicDefaultEventLoop : public QuicEventLoop { +class QUICHE_NO_EXPORT QuicPollEventLoop : public QuicEventLoop { public: - QuicDefaultEventLoop(QuicClock* clock); + QuicPollEventLoop(QuicClock* clock); // QuicEventLoop implementation. bool SupportsEdgeTriggered() const override { return false; } @@ -59,7 +59,7 @@ } private: - friend class QuicDefaultEventLoopPeer; + friend class QuicPollEventLoopPeer; struct Registration { QuicSocketEventMask events = 0; @@ -70,7 +70,7 @@ class Alarm : public QuicAlarm { public: - Alarm(QuicDefaultEventLoop* loop, + Alarm(QuicPollEventLoop* loop, QuicArenaScopedPtr<QuicAlarm::Delegate> delegate); void SetImpl() override; @@ -82,7 +82,7 @@ } private: - QuicDefaultEventLoop* loop_; + QuicPollEventLoop* loop_; // Deleted when the alarm is cancelled, causing the corresponding weak_ptr // in the alarm list to not be executed. std::shared_ptr<Alarm*> current_schedule_handle_; @@ -90,7 +90,7 @@ class AlarmFactory : public QuicAlarmFactory { public: - AlarmFactory(QuicDefaultEventLoop* loop) : loop_(loop) {} + AlarmFactory(QuicPollEventLoop* loop) : loop_(loop) {} // QuicAlarmFactory implementation. QuicAlarm* CreateAlarm(QuicAlarm::Delegate* delegate) override; @@ -99,7 +99,7 @@ QuicConnectionArena* arena) override; private: - QuicDefaultEventLoop* loop_; + QuicPollEventLoop* loop_; }; // Used for deferred execution of I/O callbacks. @@ -149,4 +149,4 @@ } // namespace quic -#endif // QUICHE_QUIC_CORE_IO_QUIC_DEFAULT_EVENT_LOOP_H_ +#endif // QUICHE_QUIC_CORE_IO_QUIC_POLL_EVENT_LOOP_H_
diff --git a/quiche/quic/core/io/quic_default_event_loop_test.cc b/quiche/quic/core/io/quic_poll_event_loop_test.cc similarity index 88% rename from quiche/quic/core/io/quic_default_event_loop_test.cc rename to quiche/quic/core/io/quic_poll_event_loop_test.cc index a530811..d8ad01f 100644 --- a/quiche/quic/core/io/quic_default_event_loop_test.cc +++ b/quiche/quic/core/io/quic_poll_event_loop_test.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "quiche/quic/core/io/quic_default_event_loop.h" +#include "quiche/quic/core/io/quic_poll_event_loop.h" #include <fcntl.h> #include <unistd.h> @@ -21,9 +21,9 @@ namespace quic { -class QuicDefaultEventLoopPeer { +class QuicPollEventLoopPeer { public: - static QuicTime::Delta ComputePollTimeout(const QuicDefaultEventLoop& loop, + static QuicTime::Delta ComputePollTimeout(const QuicPollEventLoop& loop, QuicTime now, QuicTime::Delta default_timeout) { return loop.ComputePollTimeout(now, default_timeout); @@ -57,10 +57,10 @@ MOCK_METHOD(void, OnAlarm, (), (override)); }; -class QuicDefaultEventLoopForTest : public QuicDefaultEventLoop { +class QuicPollEventLoopForTest : public QuicPollEventLoop { public: - QuicDefaultEventLoopForTest(MockClock* clock) - : QuicDefaultEventLoop(clock), clock_(clock) {} + QuicPollEventLoopForTest(MockClock* clock) + : QuicPollEventLoop(clock), clock_(clock) {} int PollSyscall(pollfd* fds, nfds_t nfds, int timeout) override { timeouts_.push_back(timeout); @@ -71,7 +71,7 @@ return -1; } clock_->AdvanceTime(QuicTime::Delta::FromMilliseconds(timeout)); - return QuicDefaultEventLoop::PollSyscall(fds, nfds, timeout); + return QuicPollEventLoop::PollSyscall(fds, nfds, timeout); } void TriggerEintrAfter(QuicTime::Delta time) { eintr_after_ = time; } @@ -84,10 +84,9 @@ std::vector<int> timeouts_; }; -class QuicDefaultEventLoopTest : public QuicTest { +class QuicPollEventLoopTest : public QuicTest { public: - QuicDefaultEventLoopTest() - : loop_(&clock_), factory_(loop_.GetAlarmFactory()) { + QuicPollEventLoopTest() : loop_(&clock_), factory_(loop_.GetAlarmFactory()) { int fds[2]; int result = ::pipe(fds); QUICHE_CHECK(result >= 0) << "Failed to create a pipe, errno: " << errno; @@ -104,14 +103,14 @@ clock_.AdvanceTime(10 * kDefaultTimeout); } - ~QuicDefaultEventLoopTest() { + ~QuicPollEventLoopTest() { close(read_fd_); close(write_fd_); } QuicTime::Delta ComputePollTimeout() { - return QuicDefaultEventLoopPeer::ComputePollTimeout(loop_, clock_.Now(), - kDefaultTimeout); + return QuicPollEventLoopPeer::ComputePollTimeout(loop_, clock_.Now(), + kDefaultTimeout); } std::pair<std::unique_ptr<QuicAlarm>, MockDelegate*> CreateAlarm() { @@ -123,13 +122,13 @@ protected: MockClock clock_; - QuicDefaultEventLoopForTest loop_; + QuicPollEventLoopForTest loop_; QuicAlarmFactory* factory_; int read_fd_; int write_fd_; }; -TEST_F(QuicDefaultEventLoopTest, NothingHappens) { +TEST_F(QuicPollEventLoopTest, NothingHappens) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); @@ -146,7 +145,7 @@ EXPECT_THAT(loop_.timeouts(), ElementsAre(4, 5)); } -TEST_F(QuicDefaultEventLoopTest, RearmWriter) { +TEST_F(QuicPollEventLoopTest, RearmWriter) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); @@ -157,7 +156,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(1)); } -TEST_F(QuicDefaultEventLoopTest, Readable) { +TEST_F(QuicPollEventLoopTest, Readable) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); @@ -168,7 +167,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(1)); } -TEST_F(QuicDefaultEventLoopTest, RearmReader) { +TEST_F(QuicPollEventLoopTest, RearmReader) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); @@ -179,7 +178,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(1)); } -TEST_F(QuicDefaultEventLoopTest, WriterUnblocked) { +TEST_F(QuicPollEventLoopTest, WriterUnblocked) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); @@ -206,7 +205,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(1)); } -TEST_F(QuicDefaultEventLoopTest, ArtificialEvent) { +TEST_F(QuicPollEventLoopTest, ArtificialEvent) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); @@ -224,7 +223,7 @@ EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); } -TEST_F(QuicDefaultEventLoopTest, Unregister) { +TEST_F(QuicPollEventLoopTest, Unregister) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); ASSERT_TRUE(loop_.UnregisterSocket(write_fd_)); @@ -237,7 +236,7 @@ EXPECT_FALSE(loop_.ArtificiallyNotifyEvent(write_fd_, kSocketEventWritable)); } -TEST_F(QuicDefaultEventLoopTest, UnregisterInsideEventHandler) { +TEST_F(QuicPollEventLoopTest, UnregisterInsideEventHandler) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); ASSERT_TRUE(loop_.RegisterSocket(write_fd_, kAllEvents, &listener)); @@ -250,7 +249,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(1)); } -TEST_F(QuicDefaultEventLoopTest, EintrHandler) { +TEST_F(QuicPollEventLoopTest, EintrHandler) { testing::StrictMock<MockQuicSocketEventListener> listener; ASSERT_TRUE(loop_.RegisterSocket(read_fd_, kAllEvents, &listener)); @@ -259,7 +258,7 @@ EXPECT_THAT(loop_.timeouts(), ElementsAre(100, 75)); } -TEST_F(QuicDefaultEventLoopTest, AlarmInFuture) { +TEST_F(QuicPollEventLoopTest, AlarmInFuture) { EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); constexpr auto kAlarmTimeout = QuicTime::Delta::FromMilliseconds(5); @@ -274,7 +273,7 @@ EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); } -TEST_F(QuicDefaultEventLoopTest, AlarmsInPast) { +TEST_F(QuicPollEventLoopTest, AlarmsInPast) { EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); constexpr auto kAlarmTimeout = QuicTime::Delta::FromMilliseconds(5); @@ -292,7 +291,7 @@ loop_.RunEventLoopOnce(QuicTime::Delta::FromMilliseconds(100)); } -TEST_F(QuicDefaultEventLoopTest, AlarmCancelled) { +TEST_F(QuicPollEventLoopTest, AlarmCancelled) { EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); constexpr auto kAlarmTimeout = QuicTime::Delta::FromMilliseconds(5); @@ -310,7 +309,7 @@ EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); } -TEST_F(QuicDefaultEventLoopTest, AlarmCancelsAnotherAlarm) { +TEST_F(QuicPollEventLoopTest, AlarmCancelsAnotherAlarm) { EXPECT_EQ(ComputePollTimeout(), kDefaultTimeout); constexpr auto kAlarmTimeout = QuicTime::Delta::FromMilliseconds(5);