Skip to content

quiche: implement QuicSystemEventLoopImpl #6723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssawilk merged 5 commits into from
Apr 30, 2019
Merged

quiche: implement QuicSystemEventLoopImpl #6723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5a8a40c
implement QuicSystemEventLoopImpl
danzh1989 Apr 26, 2019
bdcd150
Merge branch 'master' into eventloop
danzh1989 Apr 26, 2019
b0100be
include string
danzh1989 Apr 29, 2019
08431d1
Merge branch 'master' into eventloop
danzh1989 Apr 29, 2019
23cfe54
Merge branch 'master' into eventloop
danzh1989 Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ envoy_cc_test_library(
deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_test_output_impl_lib"],
)

envoy_cc_test_library(
name = "quic_platform_system_event_loop",
hdrs = ["quiche/quic/platform/api/quic_system_event_loop.h"],
repository = "@envoy",
deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_system_event_loop_impl_lib"],
)

envoy_cc_test_library(
name = "quic_platform_thread",
hdrs = ["quiche/quic/platform/api/quic_thread.h"],
Expand Down
1 change: 1 addition & 0 deletions bazel/external/quiche.genrule_cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cat <<EOF >sed_commands
/^#include/ s!net/quic/platform/impl/quic_expect_bug_impl.h!test/extensions/quic_listeners/quiche/platform/quic_expect_bug_impl.h!
/^#include/ s!net/quic/platform/impl/quic_mock_log_impl.h!test/extensions/quic_listeners/quiche/platform/quic_mock_log_impl.h!
/^#include/ s!net/quic/platform/impl/quic_port_utils_impl.h!test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h!
/^#include/ s!net/quic/platform/impl/quic_system_event_loop_impl.h!test/extensions/quic_listeners/quiche/platform/quic_system_event_loop_impl.h!
/^#include/ s!net/quic/platform/impl/quic_test_impl.h!test/extensions/quic_listeners/quiche/platform/quic_test_impl.h!
/^#include/ s!net/quic/platform/impl/quic_test_output_impl.h!test/extensions/quic_listeners/quiche/platform/quic_test_output_impl.h!
/^#include/ s!net/quic/platform/impl/quic_thread_impl.h!test/extensions/quic_listeners/quiche/platform/quic_thread_impl.h!
Expand Down
6 changes: 6 additions & 0 deletions test/extensions/quic_listeners/quiche/platform/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ envoy_cc_test(
"@com_googlesource_quiche//:quic_platform_mock_log",
"@com_googlesource_quiche//:quic_platform_port_utils",
"@com_googlesource_quiche//:quic_platform_sleep",
"@com_googlesource_quiche//:quic_platform_system_event_loop",
"@com_googlesource_quiche//:quic_platform_test_output",
"@com_googlesource_quiche//:quic_platform_thread",
],
Expand Down Expand Up @@ -113,6 +114,11 @@ envoy_cc_test_library(
],
)

envoy_cc_test_library(
name = "quic_platform_system_event_loop_impl_lib",
hdrs = ["quic_system_event_loop_impl.h"],
)

envoy_cc_test_library(
name = "quic_platform_thread_impl_lib",
hdrs = ["quic_thread_impl.h"],
Expand Down
8 changes: 8 additions & 0 deletions test/extensions/quic_listeners/quiche/platform/quic_platform_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
#include "quiche/quic/platform/api/quic_stack_trace.h"
#include "quiche/quic/platform/api/quic_stream_buffer_allocator.h"
#include "quiche/quic/platform/api/quic_string_piece.h"
#include "quiche/quic/platform/api/quic_system_event_loop.h"
#include "quiche/quic/platform/api/quic_test_output.h"
#include "quiche/quic/platform/api/quic_thread.h"
#include "quiche/quic/platform/api/quic_uint128.h"
Expand Down Expand Up @@ -590,5 +591,12 @@ TEST_F(QuicPlatformTest, TestEnvoyQuicBufferAllocator) {
}
}

TEST_F(QuicPlatformTest, TestSystemEventLoop) {
// These two interfaces are no-op in Envoy. The test just makes sure they
// build.
QuicRunSystemEventLoopIteration();
QuicSystemEventLoop("dummy");
}

} // namespace
} // namespace quic
19 changes: 19 additions & 0 deletions test/extensions/quic_listeners/quiche/platform/quic_system_event_loop_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#pragma once

// NOLINT(namespace-envoy)

// This file is part of the QUICHE platform implementation, and is not to be
// consumed or referenced directly by other Envoy code. It serves purely as a
// porting layer for QUICHE.

#include <string>

inline void QuicRunSystemEventLoopIterationImpl() {
// No-op.
}

class QuicSystemEventLoopImpl {
public:
// Only used by quic_client_bin.cc which is not required in Envoy.

@alyssawilk alyssawilk Apr 29, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lazy question - if it's only used by a file not required by Envoy, why can't we just skip implementing it?

@danzh2010 danzh2010 Apr 29, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

QuicRunSystemEventLoopIterationImpl is used by QuicClientEpollNetworkHelper which is needed to run quic e2e tests. Though QuicSystemEventLoopImpl is not used, it is bundled in same API file as QuicRunSystemEventLoopIterationImpl, so it need to be defined.

@alyssawilk alyssawilk Apr 29, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's a bummer - thanks for the explanation.

LGTM modulo clang tidy warning, and master merge.

@danzh2010 danzh2010 Apr 29, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

QuicSystemEventLoopImpl(std::string /*context_name*/) {}
};