grpc 1.8.7 → 1.9.0.pre1

data/src/ruby/spec/support/helpers.rb

@@ -31,7 +31,7 @@ module GRPC
       #
       def build_rpc_server(server_opts: {},
                            client_opts: {})
-        @server = RpcServer.new({ poll_period: 1 }.merge(server_opts))
+        @server = new_rpc_server_for_testing({ poll_period: 1 }.merge(server_opts))
         @port = @server.add_http2_port('0.0.0.0:0', :this_port_is_insecure)
         @host = "0.0.0.0:#{@port}"
         @client_opts = client_opts
@@ -68,6 +68,40 @@ module GRPC
         opts ||= @client_opts
         klass.new(host, :this_channel_is_insecure, **opts)
       end
+
+      ##
+      # Build an RPCServer for use in tests. Adds args
+      # that are useful for all tests.
+      #
+      # @param [Hash] server_opts
+      #
+      def new_rpc_server_for_testing(server_opts = {})
+        server_opts[:server_args] ||= {}
+        update_server_args_hash(server_opts[:server_args])
+        RpcServer.new(**server_opts)
+      end
+
+      ##
+      # Build an GRPC::Core::Server for use in tests. Adds args
+      # that are useful for all tests.
+      #
+      # @param [Hash] server_args
+      #
+      def new_core_server_for_testing(server_args)
+        server_args.nil? && server_args = {}
+        update_server_args_hash(server_args)
+        GRPC::Core::Server.new(server_args)
+      end
+
+      def update_server_args_hash(server_args)
+        so_reuseport_arg = 'grpc.so_reuseport'
+        unless server_args[so_reuseport_arg].nil?
+          fail 'Unexpected. grpc.so_reuseport already set.'
+        end
+        # Run tests without so_reuseport to eliminate the chance of
+        # cross-talk.
+        server_args[so_reuseport_arg] = 0
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.9.0.pre1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -226,7 +226,6 @@ files:
 - include/grpc/impl/codegen/byte_buffer_reader.h
 - include/grpc/impl/codegen/compression_types.h
 - include/grpc/impl/codegen/connectivity_state.h
-- include/grpc/impl/codegen/exec_ctx_fwd.h
 - include/grpc/impl/codegen/fork.h
 - include/grpc/impl/codegen/gpr_slice.h
 - include/grpc/impl/codegen/gpr_types.h
@@ -253,7 +252,6 @@ files:
 - include/grpc/support/avl.h
 - include/grpc/support/cmdline.h
 - include/grpc/support/cpu.h
-- include/grpc/support/histogram.h
 - include/grpc/support/host_port.h
 - include/grpc/support/log.h
 - include/grpc/support/log_windows.h
@@ -452,6 +450,70 @@ files:
 - src/core/lib/debug/stats_data.h
 - src/core/lib/debug/trace.cc
 - src/core/lib/debug/trace.h
+- src/core/lib/gpr++/abstract.h
+- src/core/lib/gpr++/atomic.h
+- src/core/lib/gpr++/atomic_with_atm.h
+- src/core/lib/gpr++/atomic_with_std.h
+- src/core/lib/gpr++/debug_location.h
+- src/core/lib/gpr++/inlined_vector.h
+- src/core/lib/gpr++/manual_constructor.h
+- src/core/lib/gpr++/memory.h
+- src/core/lib/gpr++/orphanable.h
+- src/core/lib/gpr++/ref_counted.h
+- src/core/lib/gpr++/ref_counted_ptr.h
+- src/core/lib/gpr/alloc.cc
+- src/core/lib/gpr/arena.cc
+- src/core/lib/gpr/arena.h
+- src/core/lib/gpr/atm.cc
+- src/core/lib/gpr/avl.cc
+- src/core/lib/gpr/cmdline.cc
+- src/core/lib/gpr/cpu_iphone.cc
+- src/core/lib/gpr/cpu_linux.cc
+- src/core/lib/gpr/cpu_posix.cc
+- src/core/lib/gpr/cpu_windows.cc
+- src/core/lib/gpr/env.h
+- src/core/lib/gpr/env_linux.cc
+- src/core/lib/gpr/env_posix.cc
+- src/core/lib/gpr/env_windows.cc
+- src/core/lib/gpr/fork.cc
+- src/core/lib/gpr/fork.h
+- src/core/lib/gpr/host_port.cc
+- src/core/lib/gpr/log.cc
+- src/core/lib/gpr/log_android.cc
+- src/core/lib/gpr/log_linux.cc
+- src/core/lib/gpr/log_posix.cc
+- src/core/lib/gpr/log_windows.cc
+- src/core/lib/gpr/mpscq.cc
+- src/core/lib/gpr/mpscq.h
+- src/core/lib/gpr/murmur_hash.cc
+- src/core/lib/gpr/murmur_hash.h
+- src/core/lib/gpr/spinlock.h
+- src/core/lib/gpr/string.cc
+- src/core/lib/gpr/string.h
+- src/core/lib/gpr/string_posix.cc
+- src/core/lib/gpr/string_util_windows.cc
+- src/core/lib/gpr/string_windows.cc
+- src/core/lib/gpr/string_windows.h
+- src/core/lib/gpr/subprocess_posix.cc
+- src/core/lib/gpr/subprocess_windows.cc
+- src/core/lib/gpr/sync.cc
+- src/core/lib/gpr/sync_posix.cc
+- src/core/lib/gpr/sync_windows.cc
+- src/core/lib/gpr/thd.cc
+- src/core/lib/gpr/thd_internal.h
+- src/core/lib/gpr/thd_posix.cc
+- src/core/lib/gpr/thd_windows.cc
+- src/core/lib/gpr/time.cc
+- src/core/lib/gpr/time_posix.cc
+- src/core/lib/gpr/time_precise.cc
+- src/core/lib/gpr/time_precise.h
+- src/core/lib/gpr/time_windows.cc
+- src/core/lib/gpr/tls_pthread.cc
+- src/core/lib/gpr/tmpfile.h
+- src/core/lib/gpr/tmpfile_msys.cc
+- src/core/lib/gpr/tmpfile_posix.cc
+- src/core/lib/gpr/tmpfile_windows.cc
+- src/core/lib/gpr/wrap_memcpy.cc
 - src/core/lib/http/format_request.cc
 - src/core/lib/http/format_request.h
 - src/core/lib/http/httpcli.cc
@@ -658,66 +720,6 @@ files:
 - src/core/lib/slice/slice_internal.h
 - src/core/lib/slice/slice_string_helpers.cc
 - src/core/lib/slice/slice_string_helpers.h
-- src/core/lib/support/abstract.h
-- src/core/lib/support/alloc.cc
-- src/core/lib/support/arena.cc
-- src/core/lib/support/arena.h
-- src/core/lib/support/atm.cc
-- src/core/lib/support/atomic.h
-- src/core/lib/support/atomic_with_atm.h
-- src/core/lib/support/atomic_with_std.h
-- src/core/lib/support/avl.cc
-- src/core/lib/support/cmdline.cc
-- src/core/lib/support/cpu_iphone.cc
-- src/core/lib/support/cpu_linux.cc
-- src/core/lib/support/cpu_posix.cc
-- src/core/lib/support/cpu_windows.cc
-- src/core/lib/support/env.h
-- src/core/lib/support/env_linux.cc
-- src/core/lib/support/env_posix.cc
-- src/core/lib/support/env_windows.cc
-- src/core/lib/support/fork.cc
-- src/core/lib/support/fork.h
-- src/core/lib/support/histogram.cc
-- src/core/lib/support/host_port.cc
-- src/core/lib/support/log.cc
-- src/core/lib/support/log_android.cc
-- src/core/lib/support/log_linux.cc
-- src/core/lib/support/log_posix.cc
-- src/core/lib/support/log_windows.cc
-- src/core/lib/support/manual_constructor.h
-- src/core/lib/support/memory.h
-- src/core/lib/support/mpscq.cc
-- src/core/lib/support/mpscq.h
-- src/core/lib/support/murmur_hash.cc
-- src/core/lib/support/murmur_hash.h
-- src/core/lib/support/spinlock.h
-- src/core/lib/support/string.cc
-- src/core/lib/support/string.h
-- src/core/lib/support/string_posix.cc
-- src/core/lib/support/string_util_windows.cc
-- src/core/lib/support/string_windows.cc
-- src/core/lib/support/string_windows.h
-- src/core/lib/support/subprocess_posix.cc
-- src/core/lib/support/subprocess_windows.cc
-- src/core/lib/support/sync.cc
-- src/core/lib/support/sync_posix.cc
-- src/core/lib/support/sync_windows.cc
-- src/core/lib/support/thd.cc
-- src/core/lib/support/thd_internal.h
-- src/core/lib/support/thd_posix.cc
-- src/core/lib/support/thd_windows.cc
-- src/core/lib/support/time.cc
-- src/core/lib/support/time_posix.cc
-- src/core/lib/support/time_precise.cc
-- src/core/lib/support/time_precise.h
-- src/core/lib/support/time_windows.cc
-- src/core/lib/support/tls_pthread.cc
-- src/core/lib/support/tmpfile.h
-- src/core/lib/support/tmpfile_msys.cc
-- src/core/lib/support/tmpfile_posix.cc
-- src/core/lib/support/tmpfile_windows.cc
-- src/core/lib/support/wrap_memcpy.cc
 - src/core/lib/surface/alarm.cc
 - src/core/lib/surface/alarm_internal.h
 - src/core/lib/surface/api_trace.cc
@@ -1428,9 +1430,9 @@ 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: []
 rubyforge_project: 
 rubygems_version: 2.7.4

data/include/grpc/impl/codegen/exec_ctx_fwd.h

@@ -1,26 +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.
- *
- */
-
-#ifndef GRPC_IMPL_CODEGEN_EXEC_CTX_FWD_H
-#define GRPC_IMPL_CODEGEN_EXEC_CTX_FWD_H
-
-/* forward declaration for exec_ctx.h */
-struct grpc_exec_ctx;
-typedef struct grpc_exec_ctx grpc_exec_ctx;
-
-#endif /* GRPC_IMPL_CODEGEN_EXEC_CTX_FWD_H */

data/include/grpc/support/histogram.h

@@ -1,64 +0,0 @@
-/*
- *
- * Copyright 2015 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_SUPPORT_HISTOGRAM_H
-#define GRPC_SUPPORT_HISTOGRAM_H
-
-#include <grpc/support/port_platform.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct gpr_histogram gpr_histogram;
-
-GPRAPI gpr_histogram* gpr_histogram_create(double resolution,
-                                           double max_bucket_start);
-GPRAPI void gpr_histogram_destroy(gpr_histogram* h);
-GPRAPI void gpr_histogram_add(gpr_histogram* h, double x);
-
-/** The following merges the second histogram into the first. It only works
-   if they have the same buckets and resolution. Returns 0 on failure, 1
-   on success */
-GPRAPI int gpr_histogram_merge(gpr_histogram* dst, const gpr_histogram* src);
-
-GPRAPI double gpr_histogram_percentile(gpr_histogram* histogram,
-                                       double percentile);
-GPRAPI double gpr_histogram_mean(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_stddev(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_variance(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_maximum(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_minimum(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_count(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_sum(gpr_histogram* histogram);
-GPRAPI double gpr_histogram_sum_of_squares(gpr_histogram* histogram);
-
-GPRAPI const uint32_t* gpr_histogram_get_contents(gpr_histogram* histogram,
-                                                  size_t* count);
-GPRAPI void gpr_histogram_merge_contents(gpr_histogram* histogram,
-                                         const uint32_t* data,
-                                         size_t data_count, double min_seen,
-                                         double max_seen, double sum,
-                                         double sum_of_squares, double count);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GRPC_SUPPORT_HISTOGRAM_H */

data/src/core/lib/support/histogram.cc

@@ -1,227 +0,0 @@
-/*
- *
- * Copyright 2015 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/histogram.h>
-
-#include <math.h>
-#include <stddef.h>
-#include <string.h>
-
-#include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
-#include <grpc/support/port_platform.h>
-#include <grpc/support/useful.h>
-
-/* Histograms are stored with exponentially increasing bucket sizes.
-   The first bucket is [0, m) where m = 1 + resolution
-   Bucket n (n>=1) contains [m**n, m**(n+1))
-   There are sufficient buckets to reach max_bucket_start */
-
-struct gpr_histogram {
-  /* Sum of all values seen so far */
-  double sum;
-  /* Sum of squares of all values seen so far */
-  double sum_of_squares;
-  /* number of values seen so far */
-  double count;
-  /* m in the description */
-  double multiplier;
-  double one_on_log_multiplier;
-  /* minimum value seen */
-  double min_seen;
-  /* maximum value seen */
-  double max_seen;
-  /* maximum representable value */
-  double max_possible;
-  /* number of buckets */
-  size_t num_buckets;
-  /* the buckets themselves */
-  uint32_t* buckets;
-};
-
-/* determine a bucket index given a value - does no bounds checking */
-static size_t bucket_for_unchecked(gpr_histogram* h, double x) {
-  return (size_t)(log(x) * h->one_on_log_multiplier);
-}
-
-/* bounds checked version of the above */
-static size_t bucket_for(gpr_histogram* h, double x) {
-  size_t bucket = bucket_for_unchecked(h, GPR_CLAMP(x, 1.0, h->max_possible));
-  GPR_ASSERT(bucket < h->num_buckets);
-  return bucket;
-}
-
-/* at what value does a bucket start? */
-static double bucket_start(gpr_histogram* h, double x) {
-  return pow(h->multiplier, x);
-}
-
-gpr_histogram* gpr_histogram_create(double resolution,
-                                    double max_bucket_start) {
-  gpr_histogram* h = (gpr_histogram*)gpr_malloc(sizeof(gpr_histogram));
-  GPR_ASSERT(resolution > 0.0);
-  GPR_ASSERT(max_bucket_start > resolution);
-  h->sum = 0.0;
-  h->sum_of_squares = 0.0;
-  h->multiplier = 1.0 + resolution;
-  h->one_on_log_multiplier = 1.0 / log(1.0 + resolution);
-  h->max_possible = max_bucket_start;
-  h->count = 0.0;
-  h->min_seen = max_bucket_start;
-  h->max_seen = 0.0;
-  h->num_buckets = bucket_for_unchecked(h, max_bucket_start) + 1;
-  GPR_ASSERT(h->num_buckets > 1);
-  GPR_ASSERT(h->num_buckets < 100000000);
-  h->buckets = (uint32_t*)gpr_zalloc(sizeof(uint32_t) * h->num_buckets);
-  return h;
-}
-
-void gpr_histogram_destroy(gpr_histogram* h) {
-  gpr_free(h->buckets);
-  gpr_free(h);
-}
-
-void gpr_histogram_add(gpr_histogram* h, double x) {
-  h->sum += x;
-  h->sum_of_squares += x * x;
-  h->count++;
-  if (x < h->min_seen) {
-    h->min_seen = x;
-  }
-  if (x > h->max_seen) {
-    h->max_seen = x;
-  }
-  h->buckets[bucket_for(h, x)]++;
-}
-
-int gpr_histogram_merge(gpr_histogram* dst, const gpr_histogram* src) {
-  if ((dst->num_buckets != src->num_buckets) ||
-      (dst->multiplier != src->multiplier)) {
-    /* Fail because these histograms don't match */
-    return 0;
-  }
-  gpr_histogram_merge_contents(dst, src->buckets, src->num_buckets,
-                               src->min_seen, src->max_seen, src->sum,
-                               src->sum_of_squares, src->count);
-  return 1;
-}
-
-void gpr_histogram_merge_contents(gpr_histogram* dst, const uint32_t* data,
-                                  size_t data_count, double min_seen,
-                                  double max_seen, double sum,
-                                  double sum_of_squares, double count) {
-  size_t i;
-  GPR_ASSERT(dst->num_buckets == data_count);
-  dst->sum += sum;
-  dst->sum_of_squares += sum_of_squares;
-  dst->count += count;
-  if (min_seen < dst->min_seen) {
-    dst->min_seen = min_seen;
-  }
-  if (max_seen > dst->max_seen) {
-    dst->max_seen = max_seen;
-  }
-  for (i = 0; i < dst->num_buckets; i++) {
-    dst->buckets[i] += data[i];
-  }
-}
-
-static double threshold_for_count_below(gpr_histogram* h, double count_below) {
-  double count_so_far;
-  double lower_bound;
-  double upper_bound;
-  size_t lower_idx;
-  size_t upper_idx;
-
-  if (h->count == 0) {
-    return 0.0;
-  }
-
-  if (count_below <= 0) {
-    return h->min_seen;
-  }
-  if (count_below >= h->count) {
-    return h->max_seen;
-  }
-
-  /* find the lowest bucket that gets us above count_below */
-  count_so_far = 0.0;
-  for (lower_idx = 0; lower_idx < h->num_buckets; lower_idx++) {
-    count_so_far += h->buckets[lower_idx];
-    if (count_so_far >= count_below) {
-      break;
-    }
-  }
-  if (count_so_far == count_below) {
-    /* this bucket hits the threshold exactly... we should be midway through
-       any run of zero values following the bucket */
-    for (upper_idx = lower_idx + 1; upper_idx < h->num_buckets; upper_idx++) {
-      if (h->buckets[upper_idx]) {
-        break;
-      }
-    }
-    return (bucket_start(h, (double)lower_idx) +
-            bucket_start(h, (double)upper_idx)) /
-           2.0;
-  } else {
-    /* treat values as uniform throughout the bucket, and find where this value
-       should lie */
-    lower_bound = bucket_start(h, (double)lower_idx);
-    upper_bound = bucket_start(h, (double)(lower_idx + 1));
-    return GPR_CLAMP(upper_bound - (upper_bound - lower_bound) *
-                                       (count_so_far - count_below) /
-                                       h->buckets[lower_idx],
-                     h->min_seen, h->max_seen);
-  }
-}
-
-double gpr_histogram_percentile(gpr_histogram* h, double percentile) {
-  return threshold_for_count_below(h, h->count * percentile / 100.0);
-}
-
-double gpr_histogram_mean(gpr_histogram* h) {
-  GPR_ASSERT(h->count != 0);
-  return h->sum / h->count;
-}
-
-double gpr_histogram_stddev(gpr_histogram* h) {
-  return sqrt(gpr_histogram_variance(h));
-}
-
-double gpr_histogram_variance(gpr_histogram* h) {
-  if (h->count == 0) return 0.0;
-  return (h->sum_of_squares * h->count - h->sum * h->sum) /
-         (h->count * h->count);
-}
-
-double gpr_histogram_maximum(gpr_histogram* h) { return h->max_seen; }
-
-double gpr_histogram_minimum(gpr_histogram* h) { return h->min_seen; }
-
-double gpr_histogram_count(gpr_histogram* h) { return h->count; }
-
-double gpr_histogram_sum(gpr_histogram* h) { return h->sum; }
-
-double gpr_histogram_sum_of_squares(gpr_histogram* h) {
-  return h->sum_of_squares;
-}
-
-const uint32_t* gpr_histogram_get_contents(gpr_histogram* h, size_t* size) {
-  *size = h->num_buckets;
-  return h->buckets;
-}