quiche: add epoll_server for testing

bazel/envoy_build_system.bzl

@@ -442,6 +442,7 @@ def envoy_cc_test(
         deps = [],
         tags = [],
         args = [],
+        copts = [],
         shard_count = None,
         coverage = True,
         local = False,
@@ -457,10 +458,11 @@ def envoy_cc_test(
         deps = deps,
         repository = repository,
         tags = test_lib_tags,
+        copts = copts,
     )
     native.cc_test(
         name = name,
-        copts = envoy_copts(repository, test = True),
+        copts = envoy_copts(repository, test = True) + copts,
         linkopts = envoy_test_linkopts(),
         linkstatic = 1,
         malloc = tcmalloc_external_dep(repository),
@@ -488,13 +490,14 @@ def envoy_cc_test_infrastructure_library(
         deps = [],
         repository = "",
         tags = [],
-        include_prefix = None):
+        include_prefix = None,
+        copts = []):
     native.cc_library(
         name = name,
         srcs = srcs,
         hdrs = hdrs,
         data = data,
-        copts = envoy_copts(repository, test = True),
+        copts = envoy_copts(repository, test = True) + copts,
         testonly = 1,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
             envoy_external_dep_path("googletest"),
@@ -517,7 +520,8 @@ def envoy_cc_test_library(
         deps = [],
         repository = "",
         tags = [],
-        include_prefix = None):
+        include_prefix = None,
+        copts = []):
     deps = deps + [
         repository + "//test/test_common:printers_includes",
     ]
@@ -531,6 +535,7 @@ def envoy_cc_test_library(
         repository,
         tags,
         include_prefix,
+        copts,
     )
 
 # Envoy test binaries should be specified with this function.

bazel/external/quiche.BUILD

@@ -29,6 +29,7 @@ load(":genrule_cmd.bzl", "genrule_cmd")
 load(
     "@envoy//bazel:envoy_build_system.bzl",
     "envoy_cc_test",
+    "envoy_copts",
     "envoy_select_quiche",
 )
 
@@ -48,6 +49,8 @@ genrule(
     visibility = ["//visibility:private"],
 )
 
+quiche_copt = ["-Wno-unused-parameter"]
+
 cc_library(
     name = "http2_platform",
     hdrs = [
@@ -253,6 +256,48 @@ cc_library(
     deps = [":quic_platform_export"],
 )
 
+cc_library(
+    name = "epoll_server_platform",
+    testonly = 1,
+    hdrs = [
+        "quiche/epoll_server/platform/api/epoll_address_test_utils.h",
+        "quiche/epoll_server/platform/api/epoll_bug.h",
+        "quiche/epoll_server/platform/api/epoll_expect_bug.h",
+        "quiche/epoll_server/platform/api/epoll_export.h",
+        "quiche/epoll_server/platform/api/epoll_logging.h",
+        "quiche/epoll_server/platform/api/epoll_ptr_util.h",
+        "quiche/epoll_server/platform/api/epoll_test.h",
+        "quiche/epoll_server/platform/api/epoll_thread.h",
+        "quiche/epoll_server/platform/api/epoll_time.h",
+    ],
+    visibility = ["//visibility:public"],
+    deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:epoll_server_platform_impl_lib"],
+)
+
+cc_library(
+    name = "epoll_server_lib",
+    testonly = 1,
+    srcs = [
+        "quiche/epoll_server/fake_simple_epoll_server.cc",
+        "quiche/epoll_server/simple_epoll_server.cc",
+    ],
+    hdrs = [
+        "quiche/epoll_server/fake_simple_epoll_server.h",
+        "quiche/epoll_server/simple_epoll_server.h",
+    ],
+    copts = envoy_copts("@envoy") + quiche_copt,
+    visibility = ["//visibility:public"],
+    deps = [":epoll_server_platform"],
+)
+
+envoy_cc_test(
+    name = "epoll_server_test",
+    srcs = ["quiche/epoll_server/simple_epoll_server_test.cc"],
+    copts = quiche_copt,
+    repository = "@envoy",
+    deps = [":epoll_server_lib"],
+)
+
 envoy_cc_test(
     name = "http2_platform_test",
     srcs = envoy_select_quiche(

bazel/external/quiche.genrule_cmd

@@ -21,6 +21,9 @@ cat <<EOF >sed_commands
 # Rewrite include directives for platform impl files.
 /^#include/ s!net/(http2|spdy|quic)/platform/impl/!extensions/quic_listeners/quiche/platform/!
 
+# Rewrite include directives for epoll_server platform impl files.
+/^#include/ s!net/tools/epoll_server/platform/impl!test/extensions/quic_listeners/quiche/platform/!
+
 # Strip "net/third_party" from include directives to other QUICHE files.
 /^#include/ s!net/third_party/quiche/src/!quiche/!
 

bazel/repository_locations.bzl

@@ -240,8 +240,8 @@ REPOSITORY_LOCATIONS = dict(
         urls = ["https://github.com/google/subpar/archive/1.3.0.tar.gz"],
     ),
     com_googlesource_quiche = dict(
-        # Static snapshot of https://quiche.googlesource.com/quiche/+archive/840edb6d672931ff936004fc35a82ecac6060844.tar.gz
-        sha256 = "1aba26cec596e9f3b52d93fe40e1640c854e3a4c8949e362647f67eb8e2382e3",
-        urls = ["https://storage.googleapis.com/quiche-envoy-integration/840edb6d672931ff936004fc35a82ecac6060844.tar.gz"],
+        # Static snapshot of https://quiche.googlesource.com/quiche/+archive/3e188a56edbcc471799499958bfd7c05ec45b9e2.tar.gz
+        sha256 = "b116cfac5d39390c00f13758b21978aab953d8a67d846182f39b333644ee64b2",
+        urls = ["https://storage.googleapis.com/quiche-envoy-integration/3e188a56edbcc471799499958bfd7c05ec45b9e2.tar.gz"],
     ),
 )

source/extensions/quic_listeners/quiche/platform/quic_logging_impl.h

@@ -59,16 +59,24 @@
 #define CHECK(condition)                                                                           \
   QUIC_LOG_IF_IMPL(FATAL, ABSL_PREDICT_FALSE(!(condition))) << "CHECK failed: " #condition "."
 
+#define CHECK_GT(a, b) CHECK((a) > (b))
+#define CHECK_GE(a, b) CHECK((a) >= (b))
+#define CHECK_LT(a, b) CHECK((a) < (b))
+#define CHECK_LE(a, b) CHECK((a) <= (b))
+#define CHECK_NE(a, b) CHECK((a) != (b))
+#define CHECK_EQ(a, b) CHECK((a) == (b))
+
 #ifdef NDEBUG
 // Release build
-#define DCHECK(condition) QUIC_COMPILED_OUT_LOG()
-#define QUIC_COMPILED_OUT_LOG() QUIC_LOG_IMPL_INTERNAL(false, quic::NullLogStream().stream())
-#define QUIC_DVLOG_IMPL(verbosity) QUIC_COMPILED_OUT_LOG()
-#define QUIC_DVLOG_IF_IMPL(verbosity, condition) QUIC_COMPILED_OUT_LOG()
-#define QUIC_DLOG_IMPL(severity) QUIC_COMPILED_OUT_LOG()
-#define QUIC_DLOG_IF_IMPL(severity, condition) QUIC_COMPILED_OUT_LOG()
+#define DCHECK(condition) QUIC_COMPILED_OUT_LOG(condition)
+#define QUIC_COMPILED_OUT_LOG(condition)                                                           \
+  QUIC_LOG_IMPL_INTERNAL(false && (condition), quic::NullLogStream().stream())
+#define QUIC_DVLOG_IMPL(verbosity) QUIC_COMPILED_OUT_LOG(false)
+#define QUIC_DVLOG_IF_IMPL(verbosity, condition) QUIC_COMPILED_OUT_LOG(condition)
+#define QUIC_DLOG_IMPL(severity) QUIC_COMPILED_OUT_LOG(false)
+#define QUIC_DLOG_IF_IMPL(severity, condition) QUIC_COMPILED_OUT_LOG(condition)
 #define QUIC_DLOG_INFO_IS_ON_IMPL() 0
-#define QUIC_DLOG_EVERY_N_IMPL(severity, n) QUIC_COMPILED_OUT_LOG()
+#define QUIC_DLOG_EVERY_N_IMPL(severity, n) QUIC_COMPILED_OUT_LOG(false)
 #define QUIC_NOTREACHED_IMPL()
 #else
 // Debug build
@@ -83,6 +91,11 @@
 #endif
 
 #define DCHECK_GE(a, b) DCHECK((a) >= (b))
+#define DCHECK_GT(a, b) DCHECK((a) > (b))
+#define DCHECK_LT(a, b) DCHECK((a) < (b))
+#define DCHECK_LE(a, b) DCHECK((a) <= (b))
+#define DCHECK_NE(a, b) DCHECK((a) != (b))
+#define DCHECK_EQ(a, b) DCHECK((a) == (b))
 
 #define QUIC_PREDICT_FALSE_IMPL(x) ABSL_PREDICT_FALSE(x)
 

test/extensions/quic_listeners/quiche/platform/BUILD

@@ -62,3 +62,24 @@ envoy_cc_test_library(
         "//test/test_common:environment_lib",
     ],
 )
+
+envoy_cc_test_library(
+    name = "epoll_server_platform_impl_lib",
+    hdrs = [
+        "epoll_address_test_utils_impl.h",
+        "epoll_bug_impl.h",
+        "epoll_expect_bug_impl.h",
+        "epoll_export_impl.h",
+        "epoll_logging_impl.h",
+        "epoll_ptr_util_impl.h",
+        "epoll_test_impl.h",
+        "epoll_thread_impl.h",
+        "epoll_time_impl.h",
+    ],
+    external_deps = ["abseil_time"],
+    deps = [
+        "//include/envoy/network:address_interface",
+        "//source/extensions/quic_listeners/quiche/platform:quic_platform_base_impl_lib",
+        "//test/test_common:environment_lib",
+    ],
+)

test/extensions/quic_listeners/quiche/platform/epoll_address_test_utils_impl.h

@@ -0,0 +1,44 @@
+#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 <sys/socket.h>
+
+#include <algorithm>
+
+#include "envoy/network/address.h"
+
+#include "test/test_common/environment.h"
+
+namespace epoll_server {
+
+namespace {
+
+int addressFamilyUnderTestHelper() {
+  std::vector<Envoy::Network::Address::IpVersion> versions =
+      Envoy::TestEnvironment::getIpVersionsForTest();
+  if (std::find(versions.begin(), versions.end(), Envoy::Network::Address::IpVersion::v4) !=
+      versions.end()) {
+    return AF_INET;
+  }
+  if (std::find(versions.begin(), versions.end(), Envoy::Network::Address::IpVersion::v6) !=
+      versions.end()) {
+    return AF_INET6;
+  }
+  return -1;
+}
+
+} // namespace
+
+// Returns the address family to be used for test. Return v4 if the environment
+// supports v4 only or both v4 and v6. Otherwise return v6 or an invalid value.
+int AddressFamilyUnderTestImpl() {
+  static const int version = addressFamilyUnderTestHelper();
+  return version;
+}
+
+} // namespace epoll_server

test/extensions/quic_listeners/quiche/platform/epoll_bug_impl.h

@@ -0,0 +1,11 @@
+#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 "extensions/quic_listeners/quiche/platform/quic_bug_tracker_impl.h"
+
+#define EPOLL_BUG_IMPL QUIC_BUG_IMPL

test/extensions/quic_listeners/quiche/platform/epoll_expect_bug_impl.h

@@ -0,0 +1,11 @@
+#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 "extensions/quic_listeners/quiche/platform/quic_expect_bug_impl.h"
+
+#define EXPECT_EPOLL_BUG_IMPL EXPECT_QUIC_BUG_IMPL

test/extensions/quic_listeners/quiche/platform/epoll_export_impl.h

@@ -0,0 +1,10 @@
+#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.
+
+#define EPOLL_EXPORT
+#define EPOLL_EXPORT_PRIVATE

test/extensions/quic_listeners/quiche/platform/epoll_logging_impl.h

@@ -0,0 +1,20 @@
+#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 "extensions/quic_listeners/quiche/platform/quic_logging_impl.h"
+
+namespace epoll_server {
+
+#define EPOLL_LOG_IMPL(severity) QUIC_LOG_IMPL(severity)
+#define EPOLL_VLOG_IMPL(verbosity) QUIC_VLOG_IMPL(verbosity)
+
+#define EPOLL_PLOG_IMPL(severity) QUIC_PLOG_IMPL(severity)
+
+#define EPOLL_DVLOG_IMPL(verbosity) QUIC_DVLOG_IMPL(verbosity)
+
+} // namespace epoll_server

test/extensions/quic_listeners/quiche/platform/epoll_ptr_util_impl.h

@@ -0,0 +1,17 @@
+#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 <memory>
+
+namespace epoll_server {
+
+template <typename T, typename... Args> std::unique_ptr<T> EpollMakeUniqueImpl(Args&&... args) {
+  return std::make_unique<T>(std::forward<Args>(args)...);
+}
+
+} // namespace epoll_server

test/extensions/quic_listeners/quiche/platform/epoll_test_impl.h

@@ -0,0 +1,12 @@
+#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 "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+using EpollTestImpl = ::testing::Test;

test/extensions/quic_listeners/quiche/platform/epoll_thread_impl.h

@@ -0,0 +1,15 @@
+#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 "extensions/quic_listeners/quiche/platform/quic_thread_impl.h"
+
+namespace epoll_server {
+
+using EpollThreadImpl = quic::QuicThreadImpl;
+
+} // namespace epoll_server

test/extensions/quic_listeners/quiche/platform/epoll_time_impl.h

@@ -0,0 +1,15 @@
+#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 "absl/time/clock.h"
+
+namespace epoll_server {
+
+inline int64_t WallTimeNowInUsecImpl() { return absl::GetCurrentTimeNanos() / 1000; }
+
+} // namespace epoll_server