quiche: implement SimpleLinkedHashMap platform APIs

bazel/external/quiche.BUILD

@@ -106,6 +106,7 @@ envoy_cc_library(
         "quiche/spdy/platform/api/spdy_estimate_memory_usage.h",
         "quiche/spdy/platform/api/spdy_export.h",
         "quiche/spdy/platform/api/spdy_flags.h",
+        "quiche/spdy/platform/api/spdy_macros.h",
         "quiche/spdy/platform/api/spdy_mem_slice.h",
         "quiche/spdy/platform/api/spdy_ptr_util.h",
         "quiche/spdy/platform/api/spdy_string.h",
@@ -147,6 +148,29 @@ envoy_cc_library(
     deps = ["@envoy//source/extensions/quic_listeners/quiche/platform:spdy_platform_unsafe_arena_impl_lib"],
 )
 
+envoy_cc_library(
+    name = "quiche_spdy_core_lib",
+    srcs = [
+        "quiche/spdy/core/spdy_header_block.cc",
+        "quiche/spdy/core/spdy_test_utils.cc",
+    ],
+    hdrs = [
+        "quiche/spdy/core/spdy_alt_svc_wire_format.h",
+        "quiche/spdy/core/spdy_bitmasks.h",
+        "quiche/spdy/core/spdy_header_block.h",
+        "quiche/spdy/core/spdy_headers_handler_interface.h",
+        "quiche/spdy/core/spdy_protocol.h",
+        "quiche/spdy/core/spdy_test_utils.h",
+    ],
+    copts = quiche_copt,
+    repository = "@envoy",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":spdy_platform",
+        ":spdy_platform_unsafe_arena_lib",
+    ],
+)
+
 envoy_cc_library(
     name = "quic_platform",
     srcs = ["quiche/quic/platform/api/quic_mutex.cc"] + envoy_select_quiche(
@@ -365,6 +389,32 @@ envoy_cc_test_library(
     deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_epoll_impl_lib"],
 )
 
+envoy_cc_library(
+    name = "quiche_common_platform",
+    hdrs = [
+        "quiche/common/platform/api/quiche_logging.h",
+        "quiche/common/platform/api/quiche_ptr_util.h",
+        "quiche/common/platform/api/quiche_unordered_containers.h",
+    ],
+    repository = "@envoy",
+    deps = ["@envoy//source/extensions/quic_listeners/quiche/platform:quiche_common_platform_impl_lib"],
+)
+
+envoy_cc_test_library(
+    name = "quiche_common_platform_test",
+    hdrs = ["quiche/common/platform/api/quiche_test.h"],
+    repository = "@envoy",
+    deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quiche_common_platform_test_impl_lib"],
+)
+
+envoy_cc_library(
+    name = "quiche_common_lib",
+    hdrs = ["quiche/common/simple_linked_hash_map.h"],
+    repository = "@envoy",
+    visibility = ["//visibility:public"],
+    deps = [":quiche_common_platform"],
+)
+
 envoy_cc_test(
     name = "epoll_server_test",
     srcs = ["quiche/epoll_server/simple_epoll_server_test.cc"],
@@ -373,6 +423,17 @@ envoy_cc_test(
     deps = [":epoll_server_lib"],
 )
 
+envoy_cc_test(
+    name = "quiche_common_test",
+    srcs = ["quiche/common/simple_linked_hash_map_test.cc"],
+    copts = quiche_copt,
+    repository = "@envoy",
+    deps = [
+        ":quiche_common_lib",
+        ":quiche_common_platform_test",
+    ],
+)
+
 envoy_cc_test(
     name = "http2_platform_api_test",
     srcs = [
@@ -396,6 +457,17 @@ envoy_cc_test(
     deps = [":spdy_platform"],
 )
 
+envoy_cc_test(
+    name = "quiche_spdy_core_test",
+    srcs = ["quiche/spdy/core/spdy_header_block_test.cc"],
+    copts = quiche_copt,
+    repository = "@envoy",
+    deps = [
+        ":quiche_spdy_core_lib",
+        ":spdy_platform",
+    ],
+)
+
 envoy_cc_test(
     name = "quic_platform_api_test",
     srcs = envoy_select_quiche(

bazel/external/quiche.genrule_cmd

@@ -27,10 +27,11 @@ cat <<EOF >sed_commands
 /^#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!
+/^#include/ s!net/quiche/common/platform/impl/quiche_test_impl.h!test/extensions/quic_listeners/quiche/platform/quiche_test_impl.h!
 /^#include/ s!net/spdy/platform/impl/spdy_test_helpers_impl.h!test/extensions/quic_listeners/quiche/platform/spdy_test_helpers_impl.h!
 
 # Rewrite include directives for platform impl files.
-/^#include/ s!net/(http2|spdy|quic)/platform/impl/!extensions/quic_listeners/quiche/platform/!
+/^#include/ s!net/(http2|spdy|quic|quiche/common)/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/!

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/43a1c0f10f2855c3cd142f500e8d19ac6d6f5a8c.tar.gz
-        sha256 = "7ee437b5b0f64290760cef43b93790122c751f24508e93393484ddb80c1f8bfe",
-        urls = ["https://storage.googleapis.com/quiche-envoy-integration/43a1c0f10f2855c3cd142f500e8d19ac6d6f5a8c.tar.gz"],
+        # Static snapshot of https://quiche.googlesource.com/quiche/+archive/7bf7c3c358eb954e463bde14ea27444f4bd8ea05.tar.gz
+        sha256 = "36fe180d532a9ccb18cd32328af5231636c7408104523f9ed5eebbad75f1e039",
+        urls = ["https://storage.googleapis.com/quiche-envoy-integration/7bf7c3c358eb954e463bde14ea27444f4bd8ea05.tar.gz"],
     ),
 )

source/extensions/quic_listeners/quiche/platform/BUILD

@@ -173,6 +173,18 @@ envoy_cc_library(
     ]),
 )
 
+envoy_cc_library(
+    name = "quiche_common_platform_impl_lib",
+    hdrs = [
+        "quiche_logging_impl.h",
+        "quiche_ptr_util_impl.h",
+        "quiche_unordered_containers_impl.h",
+    ],
+    external_deps = ["abseil_node_hash_map"],
+    visibility = ["//visibility:public"],
+    deps = [":quic_platform_base_impl_lib"],
+)
+
 envoy_cc_library(
     name = "quic_platform_sleep_impl_lib",
     hdrs = ["quic_sleep_impl.h"],
@@ -215,6 +227,7 @@ envoy_cc_library(
         ":quic_platform_logging_impl_lib",
         ":string_utils_lib",
         "//source/common/common:assert_lib",
+        "@com_googlesource_quiche//:quiche_common_lib",
     ]),
 )
 

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

@@ -10,6 +10,7 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/container/node_hash_map.h"
 #include "absl/container/node_hash_set.h"
+#include "quiche/common/simple_linked_hash_map.h"
 
 // NOLINT(namespace-envoy)
 
@@ -26,14 +27,11 @@ using QuicUnorderedMapImpl = absl::node_hash_map<Key, Value, Hash>;
 
 template <typename Key, typename Hash> using QuicUnorderedSetImpl = absl::node_hash_set<Key, Hash>;
 
-// TODO: implement
-template <typename Key, typename Value, typename Hash> class QuicLinkedHashMapImpl {};
-
-// TODO: implement
-template <typename Key, typename Value, int Size> class QuicSmallMapImpl {};
+template <typename Key, typename Value, typename Hash>
+using QuicLinkedHashMapImpl = quiche::SimpleLinkedHashMap<Key, Value, Hash>;
 
-// TODO: implement
-template <typename T> class QuicIntervalSetImpl;
+template <typename Key, typename Value, int Size>
+using QuicSmallMapImpl = std::unordered_map<Key, Value>;
 
 template <typename T> using QuicQueueImpl = std::queue<T>;
 

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

@@ -0,0 +1,9 @@
+#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"

source/extensions/quic_listeners/quiche/platform/quiche_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 quiche {
+
+template <typename T, typename... Args> std::unique_ptr<T> QuicheMakeUniqueImpl(Args&&... args) {
+  return std::make_unique<T>(std::forward<Args>(args)...);
+}
+
+} // namespace quiche

source/extensions/quic_listeners/quiche/platform/quiche_test_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.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"

source/extensions/quic_listeners/quiche/platform/quiche_unordered_containers_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 "absl/container/node_hash_map.h"
+
+namespace quiche {
+
+// The default hasher used by hash tables.
+template <typename Key> using QuicheDefaultHasherImpl = absl::Hash<Key>;
+
+// Similar to std::unordered_map, but with better performance and memory usage.
+template <typename Key, typename Value, typename Hash>
+using QuicheUnorderedMapImpl = absl::node_hash_map<Key, Value, Hash>;
+
+} // namespace quiche

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

@@ -1,5 +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 "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/container/inlined_vector.h"
@@ -14,12 +20,7 @@
 // TODO(mpw): fix includes to use full paths.
 #include "spdy_string_impl.h"
 #include "spdy_string_piece_impl.h"
-
-// 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 "quiche/common/simple_linked_hash_map.h"
 
 namespace spdy {
 
@@ -31,8 +32,8 @@ using SpdyHashMapImpl = absl::flat_hash_map<KeyType, ValueType, Hash>;
 template <typename ElementType, typename Hasher, typename Eq>
 using SpdyHashSetImpl = absl::flat_hash_set<ElementType, Hasher, Eq>;
 
-// TODO: implement
-template <typename Key, typename Value, typename Hash> class SpdyLinkedHashMapImpl {};
+template <typename Key, typename Value, typename Hash>
+using SpdyLinkedHashMapImpl = quiche::SimpleLinkedHashMap<Key, Value, Hash>;
 
 template <typename T, size_t N, typename A = std::allocator<T>>
 using SpdyInlinedVectorImpl = absl::InlinedVector<T, N, A>;

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

@@ -10,6 +10,3 @@
 
 #define SPDY_MUST_USE_RESULT_IMPL ABSL_MUST_USE_RESULT
 #define SPDY_UNUSED_IMPL ABSL_ATTRIBUTE_UNUSED
-
-// TODO: implement
-#define SPDY_DVLOG_IF_IMPL 0

test/extensions/quic_listeners/quiche/platform/BUILD

@@ -167,6 +167,11 @@ envoy_cc_test_library(
     ],
 )
 
+envoy_cc_test_library(
+    name = "quiche_common_platform_test_impl_lib",
+    hdrs = ["quiche_test_impl.h"],
+)
+
 envoy_cc_test_library(
     name = "spdy_platform_test_helpers_impl_lib",
     hdrs = ["spdy_test_helpers_impl.h"],

test/extensions/quic_listeners/quiche/platform/quiche_test_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.
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"