Skip to content

Commit 2888bd5

Browse files
ctillerctiller
committed
Merge github.com:grpc/grpc into error
2 parents d0e4deb + 570408f commit 2888bd5

File tree

104 files changed

+4405
-3290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+4405
-3290
lines changed

‎BUILD‎

Lines changed: 348 additions & 25 deletions
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 322 additions & 25 deletions
Large diffs are not rendered by default.

‎binding.gyp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,9 +720,6 @@
720720
'src/core/ext/client_config/uri_parser.c',
721721
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
722722
'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
723-
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
724-
'src/core/ext/transport/cronet/transport/cronet_api_dummy.c',
725-
'src/core/ext/transport/cronet/transport/cronet_transport.c',
726723
'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
727724
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
728725
'third_party/nanopb/pb_common.c',

‎build.yaml‎

Lines changed: 47 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ filegroups:
141141
- include/grpc/impl/codegen/sync_posix.h
142142
- include/grpc/impl/codegen/sync_windows.h
143143
- include/grpc/impl/codegen/time.h
144+
- name: grpc++_codegen_base_src
145+
src:
146+
- src/cpp/codegen/codegen_init.cc
147+
uses:
148+
- grpc++_codegen_base
144149
- name: grpc_base
145150
public_headers:
146151
- include/grpc/byte_buffer.h
@@ -417,7 +422,6 @@ filegroups:
417422
- grpc_client_config
418423
- name: grpc_secure
419424
public_headers:
420-
- include/grpc/grpc_cronet.h
421425
- include/grpc/grpc_security.h
422426
- include/grpc/grpc_security_constants.h
423427
headers:
@@ -585,6 +589,10 @@ filegroups:
585589
- grpc_base
586590
- grpc_secure
587591
- name: grpc_transport_cronet_client_secure
592+
public_headers:
593+
- include/grpc/grpc_cronet.h
594+
- include/grpc/grpc_security.h
595+
- include/grpc/grpc_security_constants.h
588596
headers:
589597
- third_party/objective_c/Cronet/cronet_c_for_grpc.h
590598
src:
@@ -633,7 +641,6 @@ filegroups:
633641
- include/grpc++/impl/client_unary_call.h
634642
- include/grpc++/impl/grpc_library.h
635643
- include/grpc++/impl/method_handler_impl.h
636-
- include/grpc++/impl/proto_utils.h
637644
- include/grpc++/impl/rpc_method.h
638645
- include/grpc++/impl/rpc_service_method.h
639646
- include/grpc++/impl/serialization_traits.h
@@ -658,6 +665,7 @@ filegroups:
658665
- include/grpc++/support/async_unary_call.h
659666
- include/grpc++/support/byte_buffer.h
660667
- include/grpc++/support/channel_arguments.h
668+
- include/grpc++/support/config.h
661669
- include/grpc++/support/slice.h
662670
- include/grpc++/support/status.h
663671
- include/grpc++/support/status_code_enum.h
@@ -698,9 +706,8 @@ filegroups:
698706
deps:
699707
- grpc
700708
uses:
701-
- grpc++_codegen
702-
- grpc++_config
703-
- name: grpc++_codegen
709+
- grpc++_codegen_base
710+
- name: grpc++_codegen_base
704711
language: c++
705712
public_headers:
706713
- include/grpc++/impl/codegen/async_stream.h
@@ -712,11 +719,11 @@ filegroups:
712719
- include/grpc++/impl/codegen/client_unary_call.h
713720
- include/grpc++/impl/codegen/completion_queue.h
714721
- include/grpc++/impl/codegen/completion_queue_tag.h
722+
- include/grpc++/impl/codegen/config.h
715723
- include/grpc++/impl/codegen/core_codegen_interface.h
716724
- include/grpc++/impl/codegen/create_auth_context.h
717725
- include/grpc++/impl/codegen/grpc_library.h
718726
- include/grpc++/impl/codegen/method_handler_impl.h
719-
- include/grpc++/impl/codegen/proto_utils.h
720727
- include/grpc++/impl/codegen/rpc_method.h
721728
- include/grpc++/impl/codegen/rpc_service_method.h
722729
- include/grpc++/impl/codegen/security/auth_context.h
@@ -733,22 +740,18 @@ filegroups:
733740
- include/grpc++/impl/codegen/sync_no_cxx11.h
734741
- include/grpc++/impl/codegen/sync_stream.h
735742
- include/grpc++/impl/codegen/time.h
736-
src:
737-
- src/cpp/codegen/codegen_init.cc
738743
uses:
739744
- grpc_codegen
740-
- grpc++_config_codegen
741-
- name: grpc++_config
745+
- name: grpc++_codegen_proto
742746
language: c++
743747
public_headers:
744-
- include/grpc++/support/config.h
745-
- include/grpc++/support/config_protobuf.h
748+
- include/grpc++/impl/codegen/proto_utils.h
746749
uses:
747-
- grpc++_config_codegen
748-
- name: grpc++_config_codegen
750+
- grpc++_codegen_base
751+
- grpc++_config_proto
752+
- name: grpc++_config_proto
749753
language: c++
750754
public_headers:
751-
- include/grpc++/impl/codegen/config.h
752755
- include/grpc++/impl/codegen/config_protobuf.h
753756
libs:
754757
- name: gpr
@@ -783,7 +786,6 @@ libs:
783786
- grpc_transport_chttp2_client_secure
784787
- grpc_transport_chttp2_server_insecure
785788
- grpc_transport_chttp2_client_insecure
786-
- grpc_transport_cronet_client_secure
787789
- grpc_lb_policy_grpclb
788790
- grpc_lb_policy_pick_first
789791
- grpc_lb_policy_round_robin
@@ -798,6 +800,22 @@ libs:
798800
- grpc.dependencies.openssl
799801
- grpc.dependencies.zlib
800802
vs_project_guid: '{29D16885-7228-4C31-81ED-5F9187C7F2A9}'
803+
- name: grpc_cronet
804+
build: all
805+
language: c
806+
src:
807+
- src/core/lib/surface/init.c
808+
baselib: true
809+
deps_linkage: static
810+
dll: true
811+
filegroups:
812+
- grpc_base
813+
- grpc_transport_cronet_client_secure
814+
- grpc_transport_chttp2_client_secure
815+
generate_plugin_registry: true
816+
platforms:
817+
- linux
818+
secure: true
801819
- name: grpc_dll
802820
build: private
803821
language: c
@@ -918,7 +936,8 @@ libs:
918936
dll: true
919937
filegroups:
920938
- grpc++_base
921-
- grpc++_codegen
939+
- grpc++_codegen_base
940+
- grpc++_codegen_base_src
922941
secure: check
923942
vs_project_guid: '{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}'
924943
- name: grpc++_test_config
@@ -951,6 +970,11 @@ libs:
951970
deps:
952971
- grpc++
953972
- grpc_test_util
973+
filegroups:
974+
- grpc++_codegen_base
975+
- grpc++_codegen_base_src
976+
- grpc++_codegen_proto
977+
- grpc++_config_proto
954978
- name: grpc++_unsecure
955979
build: all
956980
language: c++
@@ -963,7 +987,8 @@ libs:
963987
dll: true
964988
filegroups:
965989
- grpc++_base
966-
- grpc++_codegen
990+
- grpc++_codegen_base
991+
- grpc++_codegen_base_src
967992
secure: false
968993
vs_project_guid: '{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}'
969994
- name: grpc_cli_libs
@@ -1005,7 +1030,7 @@ libs:
10051030
- src/compiler/python_generator.cc
10061031
- src/compiler/ruby_generator.cc
10071032
filegroups:
1008-
- grpc++_config
1033+
- grpc++_config_proto
10091034
secure: false
10101035
vs_project_guid: '{B6E81D84-2ACB-41B8-8781-493A944C7817}'
10111036
vs_props:
@@ -2466,7 +2491,7 @@ targets:
24662491
- grpc
24672492
- gpr
24682493
filegroups:
2469-
- grpc++_codegen
2494+
- grpc++_codegen_base
24702495
- name: codegen_test_minimal
24712496
gtest: true
24722497
build: test
@@ -2479,7 +2504,8 @@ targets:
24792504
- src/proto/grpc/testing/stats.proto
24802505
- test/cpp/codegen/codegen_test_minimal.cc
24812506
filegroups:
2482-
- grpc++_codegen
2507+
- grpc++_codegen_base
2508+
- grpc++_codegen_base_src
24832509
- name: credentials_test
24842510
gtest: true
24852511
build: test

‎config.m4‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,6 @@ if test "$PHP_GRPC" != "no"; then
239239
src/core/ext/client_config/uri_parser.c \
240240
src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
241241
src/core/ext/transport/chttp2/client/insecure/channel_create.c \
242-
src/core/ext/transport/cronet/client/secure/cronet_channel_create.c \
243-
src/core/ext/transport/cronet/transport/cronet_api_dummy.c \
244-
src/core/ext/transport/cronet/transport/cronet_transport.c \
245242
src/core/ext/lb_policy/grpclb/load_balancer_api.c \
246243
src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
247244
third_party/nanopb/pb_common.c \
@@ -585,8 +582,6 @@ if test "$PHP_GRPC" != "no"; then
585582
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure)
586583
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/secure)
587584
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport)
588-
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/cronet/client/secure)
589-
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/cronet/transport)
590585
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
591586
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
592587
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)

‎gRPC.podspec‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ Pod::Spec.new do |s|
299299
'src/core/ext/client_config/subchannel_call_holder.h',
300300
'src/core/ext/client_config/subchannel_index.h',
301301
'src/core/ext/client_config/uri_parser.h',
302-
'third_party/objective_c/Cronet/cronet_c_for_grpc.h',
303302
'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
304303
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
305304
'third_party/nanopb/pb.h',
@@ -341,7 +340,6 @@ Pod::Spec.new do |s|
341340
'include/grpc/impl/codegen/sync_posix.h',
342341
'include/grpc/impl/codegen/sync_windows.h',
343342
'include/grpc/impl/codegen/time.h',
344-
'include/grpc/grpc_cronet.h',
345343
'include/grpc/grpc_security.h',
346344
'include/grpc/grpc_security_constants.h',
347345
'include/grpc/census.h',
@@ -503,9 +501,6 @@ Pod::Spec.new do |s|
503501
'src/core/ext/client_config/uri_parser.c',
504502
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
505503
'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
506-
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
507-
'src/core/ext/transport/cronet/transport/cronet_api_dummy.c',
508-
'src/core/ext/transport/cronet/transport/cronet_transport.c',
509504
'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
510505
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
511506
'third_party/nanopb/pb_common.c',
@@ -677,7 +672,6 @@ Pod::Spec.new do |s|
677672
'src/core/ext/client_config/subchannel_call_holder.h',
678673
'src/core/ext/client_config/subchannel_index.h',
679674
'src/core/ext/client_config/uri_parser.h',
680-
'third_party/objective_c/Cronet/cronet_c_for_grpc.h',
681675
'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
682676
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
683677
'third_party/nanopb/pb.h',

‎grpc.def‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ EXPORTS
8888
grpc_header_nonbin_value_is_legal
8989
grpc_is_binary_header
9090
grpc_call_error_to_string
91-
grpc_cronet_secure_channel_create
9291
grpc_auth_property_iterator_next
9392
grpc_auth_context_property_iterator
9493
grpc_auth_context_peer_identity

‎grpc.gemspec‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ Gem::Specification.new do |s|
167167
s.files += %w( include/grpc/impl/codegen/sync_posix.h )
168168
s.files += %w( include/grpc/impl/codegen/sync_windows.h )
169169
s.files += %w( include/grpc/impl/codegen/time.h )
170-
s.files += %w( include/grpc/grpc_cronet.h )
171170
s.files += %w( include/grpc/grpc_security.h )
172171
s.files += %w( include/grpc/grpc_security_constants.h )
173172
s.files += %w( include/grpc/census.h )
@@ -308,7 +307,6 @@ Gem::Specification.new do |s|
308307
s.files += %w( src/core/ext/client_config/subchannel_call_holder.h )
309308
s.files += %w( src/core/ext/client_config/subchannel_index.h )
310309
s.files += %w( src/core/ext/client_config/uri_parser.h )
311-
s.files += %w( third_party/objective_c/Cronet/cronet_c_for_grpc.h )
312310
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
313311
s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h )
314312
s.files += %w( third_party/nanopb/pb.h )
@@ -482,9 +480,6 @@ Gem::Specification.new do |s|
482480
s.files += %w( src/core/ext/client_config/uri_parser.c )
483481
s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
484482
s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )
485-
s.files += %w( src/core/ext/transport/cronet/client/secure/cronet_channel_create.c )
486-
s.files += %w( src/core/ext/transport/cronet/transport/cronet_api_dummy.c )
487-
s.files += %w( src/core/ext/transport/cronet/transport/cronet_transport.c )
488483
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )
489484
s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c )
490485
s.files += %w( third_party/nanopb/pb_common.c )

‎include/grpc++/impl/codegen/async_stream.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ class ClientAsyncWriter GRPC_FINAL : public ClientAsyncWriterInterface<W> {
172172
R* response, void* tag)
173173
: context_(context), call_(channel->CreateCall(method, context, cq)) {
174174
finish_ops_.RecvMessage(response);
175+
finish_ops_.AllowNoMessage();
175176

176177
init_ops_.set_output_tag(tag);
177178
init_ops_.SendInitialMetadata(context->send_initial_metadata_,

‎include/grpc++/impl/codegen/async_unary_call.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ class ClientAsyncResponseReader GRPC_FINAL
9191
collection_->finish_buf_.RecvInitialMetadata(context_);
9292
}
9393
collection_->finish_buf_.RecvMessage(msg);
94+
collection_->finish_buf_.AllowNoMessage();
9495
collection_->finish_buf_.ClientRecvStatus(context_, status);
9596
call_.PerformOps(&collection_->finish_buf_);
9697
}

0 commit comments

Comments
 (0)