grpc 1.18.0 → 1.22.0

data/src/core/ext/filters/client_channel/local_subchannel_pool.cc

@@ -0,0 +1,96 @@
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/filters/client_channel/local_subchannel_pool.h"
+
+#include "src/core/ext/filters/client_channel/subchannel.h"
+
+namespace grpc_core {
+
+LocalSubchannelPool::LocalSubchannelPool() {
+  subchannel_map_ = grpc_avl_create(&subchannel_avl_vtable_);
+}
+
+LocalSubchannelPool::~LocalSubchannelPool() {
+  grpc_avl_unref(subchannel_map_, nullptr);
+}
+
+Subchannel* LocalSubchannelPool::RegisterSubchannel(SubchannelKey* key,
+                                                    Subchannel* constructed) {
+  // Check to see if a subchannel already exists.
+  Subchannel* c =
+      static_cast<Subchannel*>(grpc_avl_get(subchannel_map_, key, nullptr));
+  if (c != nullptr) {
+    // The subchannel already exists. Reuse it.
+    c = GRPC_SUBCHANNEL_REF(c, "subchannel_register+reuse");
+    GRPC_SUBCHANNEL_UNREF(constructed, "subchannel_register+found_existing");
+  } else {
+    // There hasn't been such subchannel. Add one.
+    subchannel_map_ = grpc_avl_add(subchannel_map_, New<SubchannelKey>(*key),
+                                   constructed, nullptr);
+    c = constructed;
+  }
+  return c;
+}
+
+void LocalSubchannelPool::UnregisterSubchannel(SubchannelKey* key) {
+  subchannel_map_ = grpc_avl_remove(subchannel_map_, key, nullptr);
+}
+
+Subchannel* LocalSubchannelPool::FindSubchannel(SubchannelKey* key) {
+  Subchannel* c =
+      static_cast<Subchannel*>(grpc_avl_get(subchannel_map_, key, nullptr));
+  return c == nullptr ? c : GRPC_SUBCHANNEL_REF(c, "found_from_pool");
+}
+
+namespace {
+
+void sck_avl_destroy(void* p, void* user_data) {
+  SubchannelKey* key = static_cast<SubchannelKey*>(p);
+  Delete(key);
+}
+
+void* sck_avl_copy(void* p, void* unused) {
+  const SubchannelKey* key = static_cast<const SubchannelKey*>(p);
+  auto new_key = New<SubchannelKey>(*key);
+  return static_cast<void*>(new_key);
+}
+
+long sck_avl_compare(void* a, void* b, void* unused) {
+  const SubchannelKey* key_a = static_cast<const SubchannelKey*>(a);
+  const SubchannelKey* key_b = static_cast<const SubchannelKey*>(b);
+  return key_a->Cmp(*key_b);
+}
+
+void scv_avl_destroy(void* p, void* user_data) {}
+
+void* scv_avl_copy(void* p, void* unused) { return p; }
+
+}  // namespace
+
+const grpc_avl_vtable LocalSubchannelPool::subchannel_avl_vtable_ = {
+    sck_avl_destroy,  // destroy_key
+    sck_avl_copy,     // copy_key
+    sck_avl_compare,  // compare_keys
+    scv_avl_destroy,  // destroy_value
+    scv_avl_copy      // copy_value
+};
+
+}  // namespace grpc_core

data/src/core/ext/filters/client_channel/local_subchannel_pool.h

@@ -0,0 +1,56 @@
+/*
+ *
+ * Copyright 2018 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
+#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h"
+
+namespace grpc_core {
+
+// The local subchannel pool that is owned by a single channel. It doesn't
+// support subchannel sharing with other channels by nature. Nor does it support
+// subchannel retention when a subchannel is not used. The only real purpose of
+// using this subchannel pool is to allow subchannel reuse within the channel
+// when an incoming resolver update contains some addresses for which the
+// channel has already created subchannels.
+// Thread-unsafe.
+class LocalSubchannelPool final : public SubchannelPoolInterface {
+ public:
+  LocalSubchannelPool();
+  ~LocalSubchannelPool() override;
+
+  // Implements interface methods.
+  // Thread-unsafe. Intended to be invoked within the client_channel combiner.
+  Subchannel* RegisterSubchannel(SubchannelKey* key,
+                                 Subchannel* constructed) override;
+  void UnregisterSubchannel(SubchannelKey* key) override;
+  Subchannel* FindSubchannel(SubchannelKey* key) override;
+
+ private:
+  // The vtable for subchannel operations in an AVL tree.
+  static const grpc_avl_vtable subchannel_avl_vtable_;
+  // A map from subchannel key to subchannel.
+  grpc_avl subchannel_map_;
+};
+
+}  // namespace grpc_core
+
+#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LOCAL_SUBCHANNEL_POOL_H */

data/src/core/ext/filters/client_channel/parse_address.cc

@@ -19,6 +19,7 @@
 #include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/client_channel/parse_address.h"
+#include "src/core/lib/iomgr/grpc_if_nametoindex.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/socket_utils.h"
 
@@ -35,6 +36,11 @@
 #include "src/core/lib/gpr/host_port.h"
 #include "src/core/lib/gpr/string.h"
 
+#ifdef GRPC_POSIX_SOCKET
+#include <errno.h>
+#include <net/if.h>
+#endif
+
 #ifdef GRPC_HAVE_UNIX_SOCKET
 
 bool grpc_parse_unix(const grpc_uri* uri,
@@ -69,7 +75,12 @@ bool grpc_parse_ipv4_hostport(const char* hostport, grpc_resolved_address* addr,
   // Split host and port.
   char* host;
   char* port;
-  if (!gpr_split_host_port(hostport, &host, &port)) return false;
+  if (!gpr_split_host_port(hostport, &host, &port)) {
+    if (log_errors) {
+      gpr_log(GPR_ERROR, "Failed gpr_split_host_port(%s, ...)", hostport);
+    }
+    return false;
+  }
   // Parse IP address.
   memset(addr, 0, sizeof(*addr));
   addr->len = static_cast<socklen_t>(sizeof(grpc_sockaddr_in));
@@ -115,7 +126,12 @@ bool grpc_parse_ipv6_hostport(const char* hostport, grpc_resolved_address* addr,
   // Split host and port.
   char* host;
   char* port;
-  if (!gpr_split_host_port(hostport, &host, &port)) return false;
+  if (!gpr_split_host_port(hostport, &host, &port)) {
+    if (log_errors) {
+      gpr_log(GPR_ERROR, "Failed gpr_split_host_port(%s, ...)", hostport);
+    }
+    return false;
+  }
   // Parse IP address.
   memset(addr, 0, sizeof(*addr));
   addr->len = static_cast<socklen_t>(sizeof(grpc_sockaddr_in6));
@@ -150,10 +166,13 @@ bool grpc_parse_ipv6_hostport(const char* hostport, grpc_resolved_address* addr,
     if (gpr_parse_bytes_to_uint32(host_end + 1,
                                   strlen(host) - host_without_scope_len - 1,
                                   &sin6_scope_id) == 0) {
-      if (log_errors) {
-        gpr_log(GPR_ERROR, "invalid ipv6 scope id: '%s'", host_end + 1);
+      if ((sin6_scope_id = grpc_if_nametoindex(host_end + 1)) == 0) {
+        gpr_log(GPR_ERROR,
+                "Invalid interface name: '%s'. "
+                "Non-numeric and failed if_nametoindex.",
+                host_end + 1);
+        goto done;
       }
-      goto done;
     }
     // Handle "sin6_scope_id" being type "u_long". See grpc issue #10027.
     in6->sin6_scope_id = sin6_scope_id;