grpc 1.18.0 → 1.19.0.pre1

data/src/ruby/ext/grpc/rb_server.c

@@ -86,8 +86,7 @@ static void grpc_rb_server_maybe_destroy(grpc_rb_server* server) {
   }
 }
 
-/* Destroys server instances. */
-static void grpc_rb_server_free(void* p) {
+static void grpc_rb_server_free_internal(void* p) {
   grpc_rb_server* svr = NULL;
   gpr_timespec deadline;
   if (p == NULL) {
@@ -104,6 +103,12 @@ static void grpc_rb_server_free(void* p) {
   xfree(p);
 }
 
+/* Destroys server instances. */
+static void grpc_rb_server_free(void* p) {
+  grpc_rb_server_free_internal(p);
+  grpc_ruby_shutdown();
+}
+
 static const rb_data_type_t grpc_rb_server_data_type = {
     "grpc_server",
     {GRPC_RB_GC_NOT_MARKED,
@@ -123,6 +128,7 @@ static const rb_data_type_t grpc_rb_server_data_type = {
 
 /* Allocates grpc_rb_server instances. */
 static VALUE grpc_rb_server_alloc(VALUE cls) {
+  grpc_ruby_init();
   grpc_rb_server* wrapper = ALLOC(grpc_rb_server);
   wrapper->wrapped = NULL;
   wrapper->destroy_done = 0;
@@ -142,8 +148,6 @@ static VALUE grpc_rb_server_init(VALUE self, VALUE channel_args) {
   grpc_channel_args args;
   MEMZERO(&args, grpc_channel_args, 1);
 
-  grpc_ruby_once_init();
-
   cq = grpc_completion_queue_create_for_pluck(NULL);
   TypedData_Get_Struct(self, grpc_rb_server, &grpc_rb_server_data_type,
                        wrapper);

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.18.0'
+  VERSION = '1.19.0.pre1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0.pre1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
         version: 0.5.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ dependencies:
         version: 0.5.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
 description: Send RPCs from Ruby using GRPC
 email: temiola@google.com
 executables: []
@@ -277,6 +277,8 @@ files:
 - src/core/ext/filters/client_channel/client_channel_plugin.cc
 - src/core/ext/filters/client_channel/connector.cc
 - src/core/ext/filters/client_channel/connector.h
+- src/core/ext/filters/client_channel/global_subchannel_pool.cc
+- src/core/ext/filters/client_channel/global_subchannel_pool.h
 - src/core/ext/filters/client_channel/health/health.pb.c
 - src/core/ext/filters/client_channel/health/health.pb.h
 - src/core/ext/filters/client_channel/health/health_check_client.cc
@@ -317,6 +319,8 @@ files:
 - src/core/ext/filters/client_channel/lb_policy_factory.h
 - src/core/ext/filters/client_channel/lb_policy_registry.cc
 - src/core/ext/filters/client_channel/lb_policy_registry.h
+- src/core/ext/filters/client_channel/local_subchannel_pool.cc
+- src/core/ext/filters/client_channel/local_subchannel_pool.h
 - src/core/ext/filters/client_channel/parse_address.cc
 - src/core/ext/filters/client_channel/parse_address.h
 - src/core/ext/filters/client_channel/proxy_mapper.cc
@@ -352,8 +356,8 @@ files:
 - src/core/ext/filters/client_channel/server_address.h
 - src/core/ext/filters/client_channel/subchannel.cc
 - src/core/ext/filters/client_channel/subchannel.h
-- src/core/ext/filters/client_channel/subchannel_index.cc
-- src/core/ext/filters/client_channel/subchannel_index.h
+- src/core/ext/filters/client_channel/subchannel_pool_interface.cc
+- src/core/ext/filters/client_channel/subchannel_pool_interface.h
 - src/core/ext/filters/deadline/deadline_filter.cc
 - src/core/ext/filters/deadline/deadline_filter.h
 - src/core/ext/filters/http/client/http_client_filter.cc
@@ -455,7 +459,6 @@ files:
 - src/core/lib/channel/context.h
 - src/core/lib/channel/handshaker.cc
 - src/core/lib/channel/handshaker.h
-- src/core/lib/channel/handshaker_factory.cc
 - src/core/lib/channel/handshaker_factory.h
 - src/core/lib/channel/handshaker_registry.cc
 - src/core/lib/channel/handshaker_registry.h
@@ -540,6 +543,7 @@ files:
 - src/core/lib/gprpp/manual_constructor.h
 - src/core/lib/gprpp/memory.h
 - src/core/lib/gprpp/mutex_lock.h
+- src/core/lib/gprpp/optional.h
 - src/core/lib/gprpp/orphanable.h
 - src/core/lib/gprpp/ref_counted.h
 - src/core/lib/gprpp/ref_counted_ptr.h
@@ -590,6 +594,9 @@ files:
 - src/core/lib/iomgr/gethostname_fallback.cc
 - src/core/lib/iomgr/gethostname_host_name_max.cc
 - src/core/lib/iomgr/gethostname_sysconf.cc
+- src/core/lib/iomgr/grpc_if_nametoindex.h
+- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
+- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
 - src/core/lib/iomgr/internal_errqueue.cc
 - src/core/lib/iomgr/internal_errqueue.h
 - src/core/lib/iomgr/iocp_windows.cc
@@ -611,8 +618,6 @@ files:
 - src/core/lib/iomgr/lockfree_event.cc
 - src/core/lib/iomgr/lockfree_event.h
 - src/core/lib/iomgr/nameser.h
-- src/core/lib/iomgr/network_status_tracker.cc
-- src/core/lib/iomgr/network_status_tracker.h
 - src/core/lib/iomgr/polling_entity.cc
 - src/core/lib/iomgr/polling_entity.h
 - src/core/lib/iomgr/pollset.cc
@@ -754,6 +759,8 @@ files:
 - src/core/lib/security/credentials/plugin/plugin_credentials.h
 - src/core/lib/security/credentials/ssl/ssl_credentials.cc
 - src/core/lib/security/credentials/ssl/ssl_credentials.h
+- src/core/lib/security/credentials/tls/grpc_tls_credentials_options.cc
+- src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h
 - src/core/lib/security/security_connector/alts/alts_security_connector.cc
 - src/core/lib/security/security_connector/alts/alts_security_connector.h
 - src/core/lib/security/security_connector/fake/fake_security_connector.cc
@@ -1582,47 +1589,47 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/pb/codegen/package_option_spec.rb
-- src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
-- src/ruby/spec/pb/duplicate/codegen_spec.rb
-- src/ruby/spec/pb/health/checker_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/client_auth_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/testdata/README
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/testdata/server1.pem
 - src/ruby/spec/testdata/server1.key
+- src/ruby/spec/testdata/client.pem
 - src/ruby/spec/testdata/client.key
-- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/README
 - src/ruby/spec/testdata/ca.pem
-- src/ruby/spec/testdata/client.pem
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/compression_options_spec.rb
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/client_auth_spec.rb
 - src/ruby/spec/call_spec.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/channel_credentials_spec.rb
 - src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/generic/rpc_desc_spec.rb
+- src/ruby/spec/generic/service_spec.rb
 - src/ruby/spec/generic/client_interceptors_spec.rb
+- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
 - src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/active_call_spec.rb
 - src/ruby/spec/generic/rpc_server_pool_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
-- src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/rpc_desc_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/generic/rpc_server_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/channel_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/support/services.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/pb/health/checker_spec.rb
+- src/ruby/spec/pb/codegen/package_option_spec.rb
+- src/ruby/spec/pb/codegen/grpc/testing/package_options.proto
+- src/ruby/spec/pb/duplicate/codegen_spec.rb

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

@@ -1,248 +0,0 @@
-//
-//
-// Copyright 2016 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/subchannel_index.h"
-
-#include <stdbool.h>
-#include <string.h>
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/lib/avl/avl.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/tls.h"
-
-// a map of subchannel_key --> subchannel, used for detecting connections
-// to the same destination in order to share them
-static grpc_avl g_subchannel_index;
-
-static gpr_mu g_mu;
-
-static gpr_refcount g_refcount;
-
-struct grpc_subchannel_key {
-  grpc_subchannel_args args;
-};
-
-static bool g_force_creation = false;
-
-static grpc_subchannel_key* create_key(
-    const grpc_subchannel_args* args,
-    grpc_channel_args* (*copy_channel_args)(const grpc_channel_args* args)) {
-  grpc_subchannel_key* k =
-      static_cast<grpc_subchannel_key*>(gpr_malloc(sizeof(*k)));
-  k->args.filter_count = args->filter_count;
-  if (k->args.filter_count > 0) {
-    k->args.filters = static_cast<const grpc_channel_filter**>(
-        gpr_malloc(sizeof(*k->args.filters) * k->args.filter_count));
-    memcpy(reinterpret_cast<grpc_channel_filter*>(k->args.filters),
-           args->filters, sizeof(*k->args.filters) * k->args.filter_count);
-  } else {
-    k->args.filters = nullptr;
-  }
-  k->args.args = copy_channel_args(args->args);
-  return k;
-}
-
-grpc_subchannel_key* grpc_subchannel_key_create(
-    const grpc_subchannel_args* args) {
-  return create_key(args, grpc_channel_args_normalize);
-}
-
-static grpc_subchannel_key* subchannel_key_copy(grpc_subchannel_key* k) {
-  return create_key(&k->args, grpc_channel_args_copy);
-}
-
-int grpc_subchannel_key_compare(const grpc_subchannel_key* a,
-                                const grpc_subchannel_key* b) {
-  // To pretend the keys are different, return a non-zero value.
-  if (GPR_UNLIKELY(g_force_creation)) return 1;
-  int c = GPR_ICMP(a->args.filter_count, b->args.filter_count);
-  if (c != 0) return c;
-  if (a->args.filter_count > 0) {
-    c = memcmp(a->args.filters, b->args.filters,
-               a->args.filter_count * sizeof(*a->args.filters));
-    if (c != 0) return c;
-  }
-  return grpc_channel_args_compare(a->args.args, b->args.args);
-}
-
-void grpc_subchannel_key_destroy(grpc_subchannel_key* k) {
-  gpr_free(reinterpret_cast<grpc_channel_args*>(k->args.filters));
-  grpc_channel_args_destroy(const_cast<grpc_channel_args*>(k->args.args));
-  gpr_free(k);
-}
-
-static void sck_avl_destroy(void* p, void* unused) {
-  grpc_subchannel_key_destroy(static_cast<grpc_subchannel_key*>(p));
-}
-
-static void* sck_avl_copy(void* p, void* unused) {
-  return subchannel_key_copy(static_cast<grpc_subchannel_key*>(p));
-}
-
-static long sck_avl_compare(void* a, void* b, void* unused) {
-  return grpc_subchannel_key_compare(static_cast<grpc_subchannel_key*>(a),
-                                     static_cast<grpc_subchannel_key*>(b));
-}
-
-static void scv_avl_destroy(void* p, void* unused) {
-  GRPC_SUBCHANNEL_WEAK_UNREF((grpc_subchannel*)p, "subchannel_index");
-}
-
-static void* scv_avl_copy(void* p, void* unused) {
-  GRPC_SUBCHANNEL_WEAK_REF((grpc_subchannel*)p, "subchannel_index");
-  return p;
-}
-
-static const grpc_avl_vtable 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
-};
-
-void grpc_subchannel_index_init(void) {
-  g_subchannel_index = grpc_avl_create(&subchannel_avl_vtable);
-  gpr_mu_init(&g_mu);
-  gpr_ref_init(&g_refcount, 1);
-}
-
-void grpc_subchannel_index_shutdown(void) {
-  // TODO(juanlishen): This refcounting mechanism may lead to memory leackage.
-  // To solve that, we should force polling to flush any pending callbacks, then
-  // shutdown safely.
-  grpc_subchannel_index_unref();
-}
-
-void grpc_subchannel_index_unref(void) {
-  if (gpr_unref(&g_refcount)) {
-    gpr_mu_destroy(&g_mu);
-    grpc_avl_unref(g_subchannel_index, nullptr);
-  }
-}
-
-void grpc_subchannel_index_ref(void) { gpr_ref_non_zero(&g_refcount); }
-
-grpc_subchannel* grpc_subchannel_index_find(grpc_subchannel_key* key) {
-  // Lock, and take a reference to the subchannel index.
-  // We don't need to do the search under a lock as avl's are immutable.
-  gpr_mu_lock(&g_mu);
-  grpc_avl index = grpc_avl_ref(g_subchannel_index, nullptr);
-  gpr_mu_unlock(&g_mu);
-
-  grpc_subchannel* c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(
-      (grpc_subchannel*)grpc_avl_get(index, key, nullptr), "index_find");
-  grpc_avl_unref(index, nullptr);
-
-  return c;
-}
-
-grpc_subchannel* grpc_subchannel_index_register(grpc_subchannel_key* key,
-                                                grpc_subchannel* constructed) {
-  grpc_subchannel* c = nullptr;
-  bool need_to_unref_constructed = false;
-
-  while (c == nullptr) {
-    need_to_unref_constructed = false;
-
-    // Compare and swap loop:
-    // - take a reference to the current index
-    gpr_mu_lock(&g_mu);
-    grpc_avl index = grpc_avl_ref(g_subchannel_index, nullptr);
-    gpr_mu_unlock(&g_mu);
-
-    // - Check to see if a subchannel already exists
-    c = static_cast<grpc_subchannel*>(grpc_avl_get(index, key, nullptr));
-    if (c != nullptr) {
-      c = GRPC_SUBCHANNEL_REF_FROM_WEAK_REF(c, "index_register");
-    }
-    if (c != nullptr) {
-      // yes -> we're done
-      need_to_unref_constructed = true;
-    } else {
-      // no -> update the avl and compare/swap
-      grpc_avl updated = grpc_avl_add(
-          grpc_avl_ref(index, nullptr), subchannel_key_copy(key),
-          GRPC_SUBCHANNEL_WEAK_REF(constructed, "index_register"), nullptr);
-
-      // it may happen (but it's expected to be unlikely)
-      // that some other thread has changed the index:
-      // compare/swap here to check that, and retry as necessary
-      gpr_mu_lock(&g_mu);
-      if (index.root == g_subchannel_index.root) {
-        GPR_SWAP(grpc_avl, updated, g_subchannel_index);
-        c = constructed;
-      }
-      gpr_mu_unlock(&g_mu);
-
-      grpc_avl_unref(updated, nullptr);
-    }
-    grpc_avl_unref(index, nullptr);
-  }
-
-  if (need_to_unref_constructed) {
-    GRPC_SUBCHANNEL_UNREF(constructed, "index_register");
-  }
-
-  return c;
-}
-
-void grpc_subchannel_index_unregister(grpc_subchannel_key* key,
-                                      grpc_subchannel* constructed) {
-  bool done = false;
-  while (!done) {
-    // Compare and swap loop:
-    // - take a reference to the current index
-    gpr_mu_lock(&g_mu);
-    grpc_avl index = grpc_avl_ref(g_subchannel_index, nullptr);
-    gpr_mu_unlock(&g_mu);
-
-    // Check to see if this key still refers to the previously
-    // registered subchannel
-    grpc_subchannel* c =
-        static_cast<grpc_subchannel*>(grpc_avl_get(index, key, nullptr));
-    if (c != constructed) {
-      grpc_avl_unref(index, nullptr);
-      break;
-    }
-
-    // compare and swap the update (some other thread may have
-    // mutated the index behind us)
-    grpc_avl updated =
-        grpc_avl_remove(grpc_avl_ref(index, nullptr), key, nullptr);
-
-    gpr_mu_lock(&g_mu);
-    if (index.root == g_subchannel_index.root) {
-      GPR_SWAP(grpc_avl, updated, g_subchannel_index);
-      done = true;
-    }
-    gpr_mu_unlock(&g_mu);
-
-    grpc_avl_unref(updated, nullptr);
-    grpc_avl_unref(index, nullptr);
-  }
-}
-
-void grpc_subchannel_index_test_only_set_force_creation(bool force_creation) {
-  g_force_creation = force_creation;
-}