Skip to content

Commit 533add5

Browse files
dgquintasdgquintas
committed
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
2 parents 8ba42be + d30d4e2 commit 533add5

File tree

163 files changed

+5244
-3533
lines changed

Some content is hidden

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

163 files changed

+5244
-3533
lines changed

‎BUILD‎

Lines changed: 350 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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@
590590
'src/core/lib/iomgr/iomgr.c',
591591
'src/core/lib/iomgr/iomgr_posix.c',
592592
'src/core/lib/iomgr/iomgr_windows.c',
593+
'src/core/lib/iomgr/polling_entity.c',
593594
'src/core/lib/iomgr/pollset_set_windows.c',
594595
'src/core/lib/iomgr/pollset_windows.c',
595596
'src/core/lib/iomgr/resolve_address_posix.c',
@@ -718,9 +719,6 @@
718719
'src/core/ext/client_config/uri_parser.c',
719720
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
720721
'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
721-
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
722-
'src/core/ext/transport/cronet/transport/cronet_api_dummy.c',
723-
'src/core/ext/transport/cronet/transport/cronet_transport.c',
724722
'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
725723
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
726724
'third_party/nanopb/pb_common.c',

‎build.yaml‎

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ filegroups:
143143
- include/grpc/impl/codegen/sync_posix.h
144144
- include/grpc/impl/codegen/sync_windows.h
145145
- include/grpc/impl/codegen/time.h
146+
- name: grpc++_codegen_base_src
147+
src:
148+
- src/cpp/codegen/codegen_init.cc
149+
uses:
150+
- grpc++_codegen_base
146151
- name: grpc_base
147152
public_headers:
148153
- include/grpc/byte_buffer.h
@@ -177,6 +182,7 @@ filegroups:
177182
- src/core/lib/iomgr/iomgr.h
178183
- src/core/lib/iomgr/iomgr_internal.h
179184
- src/core/lib/iomgr/iomgr_posix.h
185+
- src/core/lib/iomgr/polling_entity.h
180186
- src/core/lib/iomgr/pollset.h
181187
- src/core/lib/iomgr/pollset_set.h
182188
- src/core/lib/iomgr/pollset_set_windows.h
@@ -252,6 +258,7 @@ filegroups:
252258
- src/core/lib/iomgr/iomgr.c
253259
- src/core/lib/iomgr/iomgr_posix.c
254260
- src/core/lib/iomgr/iomgr_windows.c
261+
- src/core/lib/iomgr/polling_entity.c
255262
- src/core/lib/iomgr/pollset_set_windows.c
256263
- src/core/lib/iomgr/pollset_windows.c
257264
- src/core/lib/iomgr/resolve_address_posix.c
@@ -415,7 +422,6 @@ filegroups:
415422
- grpc_client_config
416423
- name: grpc_secure
417424
public_headers:
418-
- include/grpc/grpc_cronet.h
419425
- include/grpc/grpc_security.h
420426
- include/grpc/grpc_security_constants.h
421427
headers:
@@ -581,6 +587,10 @@ filegroups:
581587
- grpc_base
582588
- grpc_secure
583589
- name: grpc_transport_cronet_client_secure
590+
public_headers:
591+
- include/grpc/grpc_cronet.h
592+
- include/grpc/grpc_security.h
593+
- include/grpc/grpc_security_constants.h
584594
headers:
585595
- third_party/objective_c/Cronet/cronet_c_for_grpc.h
586596
src:
@@ -629,7 +639,6 @@ filegroups:
629639
- include/grpc++/impl/client_unary_call.h
630640
- include/grpc++/impl/grpc_library.h
631641
- include/grpc++/impl/method_handler_impl.h
632-
- include/grpc++/impl/proto_utils.h
633642
- include/grpc++/impl/rpc_method.h
634643
- include/grpc++/impl/rpc_service_method.h
635644
- include/grpc++/impl/serialization_traits.h
@@ -654,6 +663,7 @@ filegroups:
654663
- include/grpc++/support/async_unary_call.h
655664
- include/grpc++/support/byte_buffer.h
656665
- include/grpc++/support/channel_arguments.h
666+
- include/grpc++/support/config.h
657667
- include/grpc++/support/slice.h
658668
- include/grpc++/support/status.h
659669
- include/grpc++/support/status_code_enum.h
@@ -694,9 +704,8 @@ filegroups:
694704
deps:
695705
- grpc
696706
uses:
697-
- grpc++_codegen
698-
- grpc++_config
699-
- name: grpc++_codegen
707+
- grpc++_codegen_base
708+
- name: grpc++_codegen_base
700709
language: c++
701710
public_headers:
702711
- include/grpc++/impl/codegen/async_stream.h
@@ -708,11 +717,11 @@ filegroups:
708717
- include/grpc++/impl/codegen/client_unary_call.h
709718
- include/grpc++/impl/codegen/completion_queue.h
710719
- include/grpc++/impl/codegen/completion_queue_tag.h
720+
- include/grpc++/impl/codegen/config.h
711721
- include/grpc++/impl/codegen/core_codegen_interface.h
712722
- include/grpc++/impl/codegen/create_auth_context.h
713723
- include/grpc++/impl/codegen/grpc_library.h
714724
- include/grpc++/impl/codegen/method_handler_impl.h
715-
- include/grpc++/impl/codegen/proto_utils.h
716725
- include/grpc++/impl/codegen/rpc_method.h
717726
- include/grpc++/impl/codegen/rpc_service_method.h
718727
- include/grpc++/impl/codegen/security/auth_context.h
@@ -729,22 +738,18 @@ filegroups:
729738
- include/grpc++/impl/codegen/sync_no_cxx11.h
730739
- include/grpc++/impl/codegen/sync_stream.h
731740
- include/grpc++/impl/codegen/time.h
732-
src:
733-
- src/cpp/codegen/codegen_init.cc
734741
uses:
735742
- grpc_codegen
736-
- grpc++_config_codegen
737-
- name: grpc++_config
743+
- name: grpc++_codegen_proto
738744
language: c++
739745
public_headers:
740-
- include/grpc++/support/config.h
741-
- include/grpc++/support/config_protobuf.h
746+
- include/grpc++/impl/codegen/proto_utils.h
742747
uses:
743-
- grpc++_config_codegen
744-
- name: grpc++_config_codegen
748+
- grpc++_codegen_base
749+
- grpc++_config_proto
750+
- name: grpc++_config_proto
745751
language: c++
746752
public_headers:
747-
- include/grpc++/impl/codegen/config.h
748753
- include/grpc++/impl/codegen/config_protobuf.h
749754
libs:
750755
- name: gpr
@@ -779,7 +784,6 @@ libs:
779784
- grpc_transport_chttp2_client_secure
780785
- grpc_transport_chttp2_server_insecure
781786
- grpc_transport_chttp2_client_insecure
782-
- grpc_transport_cronet_client_secure
783787
- grpc_lb_policy_grpclb
784788
- grpc_lb_policy_pick_first
785789
- grpc_lb_policy_round_robin
@@ -794,6 +798,22 @@ libs:
794798
- grpc.dependencies.openssl
795799
- grpc.dependencies.zlib
796800
vs_project_guid: '{29D16885-7228-4C31-81ED-5F9187C7F2A9}'
801+
- name: grpc_cronet
802+
build: all
803+
language: c
804+
src:
805+
- src/core/lib/surface/init.c
806+
baselib: true
807+
deps_linkage: static
808+
dll: true
809+
filegroups:
810+
- grpc_base
811+
- grpc_transport_cronet_client_secure
812+
- grpc_transport_chttp2_client_secure
813+
generate_plugin_registry: true
814+
platforms:
815+
- linux
816+
secure: true
797817
- name: grpc_dll
798818
build: private
799819
language: c
@@ -929,7 +949,8 @@ libs:
929949
dll: true
930950
filegroups:
931951
- grpc++_base
932-
- grpc++_codegen
952+
- grpc++_codegen_base
953+
- grpc++_codegen_base_src
933954
secure: check
934955
vs_project_guid: '{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}'
935956
- name: grpc++_test_config
@@ -962,6 +983,11 @@ libs:
962983
deps:
963984
- grpc++
964985
- grpc_test_util
986+
filegroups:
987+
- grpc++_codegen_base
988+
- grpc++_codegen_base_src
989+
- grpc++_codegen_proto
990+
- grpc++_config_proto
965991
- name: grpc++_unsecure
966992
build: all
967993
language: c++
@@ -974,7 +1000,8 @@ libs:
9741000
dll: true
9751001
filegroups:
9761002
- grpc++_base
977-
- grpc++_codegen
1003+
- grpc++_codegen_base
1004+
- grpc++_codegen_base_src
9781005
secure: false
9791006
vs_project_guid: '{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}'
9801007
- name: grpc_cli_libs
@@ -1016,7 +1043,7 @@ libs:
10161043
- src/compiler/python_generator.cc
10171044
- src/compiler/ruby_generator.cc
10181045
filegroups:
1019-
- grpc++_config
1046+
- grpc++_config_proto
10201047
secure: false
10211048
vs_project_guid: '{B6E81D84-2ACB-41B8-8781-493A944C7817}'
10221049
vs_props:
@@ -2462,7 +2489,7 @@ targets:
24622489
- grpc
24632490
- gpr
24642491
filegroups:
2465-
- grpc++_codegen
2492+
- grpc++_codegen_base
24662493
- name: codegen_test_minimal
24672494
gtest: true
24682495
build: test
@@ -2475,7 +2502,8 @@ targets:
24752502
- src/proto/grpc/testing/stats.proto
24762503
- test/cpp/codegen/codegen_test_minimal.cc
24772504
filegroups:
2478-
- grpc++_codegen
2505+
- grpc++_codegen_base
2506+
- grpc++_codegen_base_src
24792507
- name: credentials_test
24802508
gtest: true
24812509
build: test

‎config.m4‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ if test "$PHP_GRPC" != "no"; then
109109
src/core/lib/iomgr/iomgr.c \
110110
src/core/lib/iomgr/iomgr_posix.c \
111111
src/core/lib/iomgr/iomgr_windows.c \
112+
src/core/lib/iomgr/polling_entity.c \
112113
src/core/lib/iomgr/pollset_set_windows.c \
113114
src/core/lib/iomgr/pollset_windows.c \
114115
src/core/lib/iomgr/resolve_address_posix.c \
@@ -237,9 +238,6 @@ if test "$PHP_GRPC" != "no"; then
237238
src/core/ext/client_config/uri_parser.c \
238239
src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
239240
src/core/ext/transport/chttp2/client/insecure/channel_create.c \
240-
src/core/ext/transport/cronet/client/secure/cronet_channel_create.c \
241-
src/core/ext/transport/cronet/transport/cronet_api_dummy.c \
242-
src/core/ext/transport/cronet/transport/cronet_transport.c \
243241
src/core/ext/lb_policy/grpclb/load_balancer_api.c \
244242
src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c \
245243
third_party/nanopb/pb_common.c \
@@ -583,8 +581,6 @@ if test "$PHP_GRPC" != "no"; then
583581
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure)
584582
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/secure)
585583
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/transport)
586-
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/cronet/client/secure)
587-
PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/cronet/transport)
588584
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
589585
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
590586
PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)

‎gRPC.podspec‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ Pod::Spec.new do |s|
190190
'src/core/lib/iomgr/iomgr.h',
191191
'src/core/lib/iomgr/iomgr_internal.h',
192192
'src/core/lib/iomgr/iomgr_posix.h',
193+
'src/core/lib/iomgr/polling_entity.h',
193194
'src/core/lib/iomgr/pollset.h',
194195
'src/core/lib/iomgr/pollset_set.h',
195196
'src/core/lib/iomgr/pollset_set_windows.h',
@@ -298,7 +299,6 @@ Pod::Spec.new do |s|
298299
'src/core/ext/client_config/subchannel_call_holder.h',
299300
'src/core/ext/client_config/subchannel_index.h',
300301
'src/core/ext/client_config/uri_parser.h',
301-
'third_party/objective_c/Cronet/cronet_c_for_grpc.h',
302302
'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
303303
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
304304
'third_party/nanopb/pb.h',
@@ -340,7 +340,6 @@ Pod::Spec.new do |s|
340340
'include/grpc/impl/codegen/sync_posix.h',
341341
'include/grpc/impl/codegen/sync_windows.h',
342342
'include/grpc/impl/codegen/time.h',
343-
'include/grpc/grpc_cronet.h',
344343
'include/grpc/grpc_security.h',
345344
'include/grpc/grpc_security_constants.h',
346345
'include/grpc/census.h',
@@ -371,6 +370,7 @@ Pod::Spec.new do |s|
371370
'src/core/lib/iomgr/iomgr.c',
372371
'src/core/lib/iomgr/iomgr_posix.c',
373372
'src/core/lib/iomgr/iomgr_windows.c',
373+
'src/core/lib/iomgr/polling_entity.c',
374374
'src/core/lib/iomgr/pollset_set_windows.c',
375375
'src/core/lib/iomgr/pollset_windows.c',
376376
'src/core/lib/iomgr/resolve_address_posix.c',
@@ -499,9 +499,6 @@ Pod::Spec.new do |s|
499499
'src/core/ext/client_config/uri_parser.c',
500500
'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
501501
'src/core/ext/transport/chttp2/client/insecure/channel_create.c',
502-
'src/core/ext/transport/cronet/client/secure/cronet_channel_create.c',
503-
'src/core/ext/transport/cronet/transport/cronet_api_dummy.c',
504-
'src/core/ext/transport/cronet/transport/cronet_transport.c',
505502
'src/core/ext/lb_policy/grpclb/load_balancer_api.c',
506503
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
507504
'third_party/nanopb/pb_common.c',
@@ -563,6 +560,7 @@ Pod::Spec.new do |s|
563560
'src/core/lib/iomgr/iomgr.h',
564561
'src/core/lib/iomgr/iomgr_internal.h',
565562
'src/core/lib/iomgr/iomgr_posix.h',
563+
'src/core/lib/iomgr/polling_entity.h',
566564
'src/core/lib/iomgr/pollset.h',
567565
'src/core/lib/iomgr/pollset_set.h',
568566
'src/core/lib/iomgr/pollset_set_windows.h',
@@ -671,7 +669,6 @@ Pod::Spec.new do |s|
671669
'src/core/ext/client_config/subchannel_call_holder.h',
672670
'src/core/ext/client_config/subchannel_index.h',
673671
'src/core/ext/client_config/uri_parser.h',
674-
'third_party/objective_c/Cronet/cronet_c_for_grpc.h',
675672
'src/core/ext/lb_policy/grpclb/load_balancer_api.h',
676673
'src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h',
677674
'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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ Gem::Specification.new do |s|
169169
s.files += %w( include/grpc/impl/codegen/sync_posix.h )
170170
s.files += %w( include/grpc/impl/codegen/sync_windows.h )
171171
s.files += %w( include/grpc/impl/codegen/time.h )
172-
s.files += %w( include/grpc/grpc_cronet.h )
173172
s.files += %w( include/grpc/grpc_security.h )
174173
s.files += %w( include/grpc/grpc_security_constants.h )
175174
s.files += %w( include/grpc/census.h )
@@ -199,6 +198,7 @@ Gem::Specification.new do |s|
199198
s.files += %w( src/core/lib/iomgr/iomgr.h )
200199
s.files += %w( src/core/lib/iomgr/iomgr_internal.h )
201200
s.files += %w( src/core/lib/iomgr/iomgr_posix.h )
201+
s.files += %w( src/core/lib/iomgr/polling_entity.h )
202202
s.files += %w( src/core/lib/iomgr/pollset.h )
203203
s.files += %w( src/core/lib/iomgr/pollset_set.h )
204204
s.files += %w( src/core/lib/iomgr/pollset_set_windows.h )
@@ -307,7 +307,6 @@ Gem::Specification.new do |s|
307307
s.files += %w( src/core/ext/client_config/subchannel_call_holder.h )
308308
s.files += %w( src/core/ext/client_config/subchannel_index.h )
309309
s.files += %w( src/core/ext/client_config/uri_parser.h )
310-
s.files += %w( third_party/objective_c/Cronet/cronet_c_for_grpc.h )
311310
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
312311
s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h )
313312
s.files += %w( third_party/nanopb/pb.h )
@@ -350,6 +349,7 @@ Gem::Specification.new do |s|
350349
s.files += %w( src/core/lib/iomgr/iomgr.c )
351350
s.files += %w( src/core/lib/iomgr/iomgr_posix.c )
352351
s.files += %w( src/core/lib/iomgr/iomgr_windows.c )
352+
s.files += %w( src/core/lib/iomgr/polling_entity.c )
353353
s.files += %w( src/core/lib/iomgr/pollset_set_windows.c )
354354
s.files += %w( src/core/lib/iomgr/pollset_windows.c )
355355
s.files += %w( src/core/lib/iomgr/resolve_address_posix.c )
@@ -478,9 +478,6 @@ Gem::Specification.new do |s|
478478
s.files += %w( src/core/ext/client_config/uri_parser.c )
479479
s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
480480
s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )
481-
s.files += %w( src/core/ext/transport/cronet/client/secure/cronet_channel_create.c )
482-
s.files += %w( src/core/ext/transport/cronet/transport/cronet_api_dummy.c )
483-
s.files += %w( src/core/ext/transport/cronet/transport/cronet_transport.c )
484481
s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )
485482
s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c )
486483
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)