grpc 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d8e4e2178d68b163eaa55597cdf02e73a6bc3e7725508bd231b40f0e009ad9
-  data.tar.gz: 1d10837efd1dc602ef3db00ddfa766b14dee8752794b1dddc99cd6d6dd8f1b29
+  metadata.gz: 065de09079ae423e3dcd9712c95d3d34da1b8e1cd4354d9d3420ef76f5449a5e
+  data.tar.gz: e887a242689cab6897316679676e83e2fe7a54787304192cc6fc56c2b114f5aa
 SHA512:
-  metadata.gz: 8c12df8adbed4d492957e770990e30c5a2fdce5ceb4083439f76f06c5822be76bed36ebb98bbceb867d448e86f0896d153523112d99e88c5fa116820923259db
-  data.tar.gz: f1d3ea5e46ee6a48a1bff2013257813255e3113322b33ea0bcc54b2f6919255f8f43c2c0af519db5c80a281724a37318a30faa5223b9023adc5459fc89832152
+  metadata.gz: 8b5d84d7e395f3e1866f4c7f1a1d5a02c6c3e4497855e1edbac3e056743066805cf1d74c0f2511dab846030d3acfbd68400c6fd7b79a2843da19f13abb6e7c0a
+  data.tar.gz: a0b7664624f5df00c51980f4cba7eff332d63212f04d4f2e749413e0c3abb1f882f32d69ba9c22e1c7cafe7be6f627578ab7e9b419e2a4261734d458b747d34b

data/Makefile

@@ -437,8 +437,8 @@ Q = @
 endif
 
 CORE_VERSION = 6.0.0
-CPP_VERSION = 1.14.0
-CSHARP_VERSION = 1.14.0
+CPP_VERSION = 1.14.1
+CSHARP_VERSION = 1.14.1
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc

@@ -813,11 +813,7 @@ static void set_write_state(grpc_chttp2_transport* t,
                                  write_state_name(st), reason));
   t->write_state = st;
   if (st == GRPC_CHTTP2_WRITE_STATE_IDLE) {
-    grpc_chttp2_stream* s;
-    while (grpc_chttp2_list_pop_waiting_for_write_stream(t, &s)) {
-      GRPC_CLOSURE_LIST_SCHED(&s->run_after_write);
-      GRPC_CHTTP2_STREAM_UNREF(s, "chttp2:write_closure_sched");
-    }
+    GRPC_CLOSURE_LIST_SCHED(&t->run_after_write);
     if (t->close_transport_on_writes_finished != nullptr) {
       grpc_error* err = t->close_transport_on_writes_finished;
       t->close_transport_on_writes_finished = nullptr;
@@ -1208,14 +1204,11 @@ void grpc_chttp2_complete_closure_step(grpc_chttp2_transport* t,
         grpc_error_add_child(closure->error_data.error, error);
   }
   if (closure->next_data.scratch < CLOSURE_BARRIER_FIRST_REF_BIT) {
-    if (s->seen_error || (t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) ||
+    if ((t->write_state == GRPC_CHTTP2_WRITE_STATE_IDLE) ||
         !(closure->next_data.scratch & CLOSURE_BARRIER_MAY_COVER_WRITE)) {
       GRPC_CLOSURE_RUN(closure, closure->error_data.error);
     } else {
-      if (grpc_chttp2_list_add_waiting_for_write_stream(t, s)) {
-        GRPC_CHTTP2_STREAM_REF(s, "chttp2:pending_write_closure");
-      }
-      grpc_closure_list_append(&s->run_after_write, closure,
+      grpc_closure_list_append(&t->run_after_write, closure,
                                closure->error_data.error);
     }
   }
@@ -2016,10 +2009,6 @@ static void remove_stream(grpc_chttp2_transport* t, uint32_t id,
 
 void grpc_chttp2_cancel_stream(grpc_chttp2_transport* t, grpc_chttp2_stream* s,
                                grpc_error* due_to_error) {
-  GRPC_CLOSURE_LIST_SCHED(&s->run_after_write);
-  if (grpc_chttp2_list_remove_waiting_for_write_stream(t, s)) {
-    GRPC_CHTTP2_STREAM_UNREF(s, "chttp2:pending_write_closure");
-  }
   if (!t->is_client && !s->sent_trailing_metadata &&
       grpc_error_has_clear_grpc_status(due_to_error)) {
     close_from_api(t, s, due_to_error);

data/src/core/ext/transport/chttp2/transport/internal.h

@@ -54,8 +54,6 @@ typedef enum {
   /** streams that are waiting to start because there are too many concurrent
       streams on the connection */
   GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY,
-  /** streams with closures waiting to be run on a write **/
-  GRPC_CHTTP2_LIST_WAITING_FOR_WRITE,
   STREAM_LIST_COUNT /* must be last */
 } grpc_chttp2_stream_list_id;
 
@@ -433,6 +431,9 @@ struct grpc_chttp2_transport {
    */
   grpc_error* close_transport_on_writes_finished;
 
+  /* a list of closures to run after writes are finished */
+  grpc_closure_list run_after_write;
+
   /* buffer pool state */
   /** have we scheduled a benign cleanup? */
   bool benign_reclaimer_registered;
@@ -583,7 +584,6 @@ struct grpc_chttp2_stream {
 
   grpc_slice_buffer flow_controlled_buffer;
 
-  grpc_closure_list run_after_write;
   grpc_chttp2_write_cb* on_flow_controlled_cbs;
   grpc_chttp2_write_cb* on_write_finished_cbs;
   grpc_chttp2_write_cb* finish_after_write;
@@ -686,13 +686,6 @@ bool grpc_chttp2_list_pop_stalled_by_stream(grpc_chttp2_transport* t,
 bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t,
                                                grpc_chttp2_stream* s);
 
-bool grpc_chttp2_list_add_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                   grpc_chttp2_stream* s);
-bool grpc_chttp2_list_pop_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                   grpc_chttp2_stream** s);
-bool grpc_chttp2_list_remove_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                      grpc_chttp2_stream* s);
-
 /********* Flow Control ***************/
 
 // Takes in a flow control action and performs all the needed operations.

data/src/core/ext/transport/chttp2/transport/stream_lists.cc

@@ -35,8 +35,6 @@ static const char* stream_list_id_string(grpc_chttp2_stream_list_id id) {
       return "stalled_by_stream";
     case GRPC_CHTTP2_LIST_WAITING_FOR_CONCURRENCY:
       return "waiting_for_concurrency";
-    case GRPC_CHTTP2_LIST_WAITING_FOR_WRITE:
-      return "waiting_for_write";
     case STREAM_LIST_COUNT:
       GPR_UNREACHABLE_CODE(return "unknown");
   }
@@ -216,18 +214,3 @@ bool grpc_chttp2_list_remove_stalled_by_stream(grpc_chttp2_transport* t,
                                                grpc_chttp2_stream* s) {
   return stream_list_maybe_remove(t, s, GRPC_CHTTP2_LIST_STALLED_BY_STREAM);
 }
-
-bool grpc_chttp2_list_add_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                   grpc_chttp2_stream* s) {
-  return stream_list_add(t, s, GRPC_CHTTP2_LIST_WAITING_FOR_WRITE);
-}
-
-bool grpc_chttp2_list_pop_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                   grpc_chttp2_stream** s) {
-  return stream_list_pop(t, s, GRPC_CHTTP2_LIST_WAITING_FOR_WRITE);
-}
-
-bool grpc_chttp2_list_remove_waiting_for_write_stream(grpc_chttp2_transport* t,
-                                                      grpc_chttp2_stream* s) {
-  return stream_list_maybe_remove(t, s, GRPC_CHTTP2_LIST_WAITING_FOR_WRITE);
-}

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

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.14.0'
+  VERSION = '1.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -1557,36 +1557,36 @@ signing_key:
 specification_version: 4
 summary: GRPC system in Ruby
 test_files:
-- src/ruby/spec/channel_credentials_spec.rb
-- src/ruby/spec/error_sanity_spec.rb
-- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/call_credentials_spec.rb
+- src/ruby/spec/channel_connection_spec.rb
+- src/ruby/spec/google_rpc_status_utils_spec.rb
+- src/ruby/spec/time_consts_spec.rb
+- src/ruby/spec/server_credentials_spec.rb
+- src/ruby/spec/server_spec.rb
+- src/ruby/spec/support/helpers.rb
+- src/ruby/spec/support/services.rb
 - src/ruby/spec/channel_spec.rb
-- src/ruby/spec/pb/health/checker_spec.rb
-- src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/call_spec.rb
+- src/ruby/spec/client_server_spec.rb
+- src/ruby/spec/generic/interceptor_registry_spec.rb
+- src/ruby/spec/generic/server_interceptors_spec.rb
 - src/ruby/spec/generic/rpc_server_pool_spec.rb
+- src/ruby/spec/generic/client_stub_spec.rb
 - src/ruby/spec/generic/rpc_desc_spec.rb
 - src/ruby/spec/generic/service_spec.rb
-- src/ruby/spec/generic/active_call_spec.rb
 - src/ruby/spec/generic/rpc_server_spec.rb
-- src/ruby/spec/generic/server_interceptors_spec.rb
+- src/ruby/spec/generic/active_call_spec.rb
 - src/ruby/spec/generic/client_interceptors_spec.rb
-- src/ruby/spec/generic/client_stub_spec.rb
-- src/ruby/spec/generic/interceptor_registry_spec.rb
-- src/ruby/spec/time_consts_spec.rb
-- src/ruby/spec/client_server_spec.rb
-- src/ruby/spec/google_rpc_status_utils_spec.rb
-- src/ruby/spec/spec_helper.rb
 - src/ruby/spec/compression_options_spec.rb
-- src/ruby/spec/support/helpers.rb
-- src/ruby/spec/support/services.rb
-- src/ruby/spec/server_spec.rb
-- src/ruby/spec/server_credentials_spec.rb
-- src/ruby/spec/call_spec.rb
-- src/ruby/spec/channel_connection_spec.rb
-- src/ruby/spec/call_credentials_spec.rb
-- src/ruby/spec/testdata/ca.pem
+- src/ruby/spec/channel_credentials_spec.rb
 - src/ruby/spec/testdata/server1.key
 - src/ruby/spec/testdata/README
-- src/ruby/spec/testdata/server1.pem
 - src/ruby/spec/testdata/client.pem
+- src/ruby/spec/testdata/server1.pem
+- src/ruby/spec/testdata/ca.pem
 - src/ruby/spec/testdata/client.key
+- src/ruby/spec/client_auth_spec.rb
+- src/ruby/spec/error_sanity_spec.rb
+- src/ruby/spec/spec_helper.rb
+- src/ruby/spec/pb/duplicate/codegen_spec.rb
+- src/ruby/spec/pb/health/checker_spec.rb