Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface

1 files changed, 197 insertions, 98 deletions

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index c1471c8283..27410ed0b3 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -84,7 +84,7 @@ Pod::Spec.new do |s|
     'HEADER_SEARCH_PATHS' => '"$(inherited)" "$(GRPC_SRC_ROOT)/include"',
     'USER_HEADER_SEARCH_PATHS' => '"$(GRPC_SRC_ROOT)"',
     # If we don't set these two settings, `include/grpc/support/time.h` and
-    # `src/core/lib/support/string.h` shadow the system `<time.h>` and `<string.h>`, breaking the
+    # `src/core/lib/gpr/string.h` shadow the system `<time.h>` and `<string.h>`, breaking the
     # build.
     'USE_HEADERMAP' => 'NO',
     'ALWAYS_SEARCH_USER_PATHS' => 'NO',
@@ -152,7 +152,6 @@ Pod::Spec.new do |s|
                       '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/grpc_types.h',
                       'include/grpc/impl/codegen/propagation_bits.h',
                       'include/grpc/impl/codegen/slice.h',
@@ -194,68 +193,68 @@ Pod::Spec.new do |s|
     ss.dependency 'nanopb', '~> 0.3'
 
     # To save you from scrolling, this is the last part of the podspec.
-    ss.source_files = 'src/core/lib/profiling/timers.h',
-                      'src/core/lib/support/abstract.h',
-                      'src/core/lib/support/arena.h',
-                      '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/env.h',
-                      'src/core/lib/support/fork.h',
-                      'src/core/lib/support/manual_constructor.h',
-                      'src/core/lib/support/memory.h',
-                      'src/core/lib/support/mpscq.h',
-                      'src/core/lib/support/murmur_hash.h',
-                      'src/core/lib/support/spinlock.h',
-                      'src/core/lib/support/string.h',
-                      'src/core/lib/support/string_windows.h',
-                      'src/core/lib/support/thd_internal.h',
-                      'src/core/lib/support/time_precise.h',
-                      'src/core/lib/support/tmpfile.h',
+    ss.source_files = '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++/manual_constructor.h',
+                      'src/core/lib/gpr++/memory.h',
+                      'src/core/lib/gpr/arena.h',
+                      'src/core/lib/gpr/env.h',
+                      'src/core/lib/gpr/fork.h',
+                      'src/core/lib/gpr/mpscq.h',
+                      'src/core/lib/gpr/murmur_hash.h',
+                      'src/core/lib/gpr/spinlock.h',
+                      'src/core/lib/gpr/string.h',
+                      'src/core/lib/gpr/string_windows.h',
+                      'src/core/lib/gpr/thd_internal.h',
+                      'src/core/lib/gpr/time_precise.h',
+                      'src/core/lib/gpr/tmpfile.h',
+                      'src/core/lib/profiling/timers.h',
+                      'src/core/lib/gpr/alloc.cc',
+                      'src/core/lib/gpr/arena.cc',
+                      '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_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/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/murmur_hash.cc',
+                      'src/core/lib/gpr/string.cc',
+                      '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/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_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_windows.cc',
+                      'src/core/lib/gpr/tls_pthread.cc',
+                      '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/profiling/basic_timers.cc',
                       'src/core/lib/profiling/stap_timers.cc',
-                      'src/core/lib/support/alloc.cc',
-                      'src/core/lib/support/arena.cc',
-                      'src/core/lib/support/atm.cc',
-                      '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_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/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/mpscq.cc',
-                      'src/core/lib/support/murmur_hash.cc',
-                      'src/core/lib/support/string.cc',
-                      '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/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_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_windows.cc',
-                      'src/core/lib/support/tls_pthread.cc',
-                      '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/ext/transport/chttp2/transport/bin_decoder.h',
                       'src/core/ext/transport/chttp2/transport/bin_encoder.h',
                       'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
@@ -347,6 +346,11 @@ Pod::Spec.new do |s|
                       'src/core/lib/compression/stream_compression_identity.h',
                       'src/core/lib/debug/stats.h',
                       'src/core/lib/debug/stats_data.h',
+                      'src/core/lib/gpr++/debug_location.h',
+                      'src/core/lib/gpr++/inlined_vector.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/http/format_request.h',
                       'src/core/lib/http/httpcli.h',
                       'src/core/lib/http/parser.h',
@@ -422,9 +426,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/slice/slice_hash_table.h',
                       'src/core/lib/slice/slice_internal.h',
                       'src/core/lib/slice/slice_string_helpers.h',
-                      'src/core/lib/support/debug_location.h',
-                      'src/core/lib/support/ref_counted.h',
-                      'src/core/lib/support/ref_counted_ptr.h',
                       'src/core/lib/surface/alarm_internal.h',
                       'src/core/lib/surface/api_trace.h',
                       'src/core/lib/surface/call.h',
@@ -721,24 +722,24 @@ Pod::Spec.new do |s|
                       'src/core/ext/filters/workarounds/workaround_utils.cc',
                       'src/core/plugin_registry/grpc_plugin_registry.cc'
 
-    ss.private_header_files = 'src/core/lib/profiling/timers.h',
-                              'src/core/lib/support/abstract.h',
-                              'src/core/lib/support/arena.h',
-                              '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/env.h',
-                              'src/core/lib/support/fork.h',
-                              'src/core/lib/support/manual_constructor.h',
-                              'src/core/lib/support/memory.h',
-                              'src/core/lib/support/mpscq.h',
-                              'src/core/lib/support/murmur_hash.h',
-                              'src/core/lib/support/spinlock.h',
-                              'src/core/lib/support/string.h',
-                              'src/core/lib/support/string_windows.h',
-                              'src/core/lib/support/thd_internal.h',
-                              'src/core/lib/support/time_precise.h',
-                              'src/core/lib/support/tmpfile.h',
+    ss.private_header_files = '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++/manual_constructor.h',
+                              'src/core/lib/gpr++/memory.h',
+                              'src/core/lib/gpr/arena.h',
+                              'src/core/lib/gpr/env.h',
+                              'src/core/lib/gpr/fork.h',
+                              'src/core/lib/gpr/mpscq.h',
+                              'src/core/lib/gpr/murmur_hash.h',
+                              'src/core/lib/gpr/spinlock.h',
+                              'src/core/lib/gpr/string.h',
+                              'src/core/lib/gpr/string_windows.h',
+                              'src/core/lib/gpr/thd_internal.h',
+                              'src/core/lib/gpr/time_precise.h',
+                              'src/core/lib/gpr/tmpfile.h',
+                              'src/core/lib/profiling/timers.h',
                               'src/core/ext/transport/chttp2/transport/bin_decoder.h',
                               'src/core/ext/transport/chttp2/transport/bin_encoder.h',
                               'src/core/ext/transport/chttp2/transport/chttp2_transport.h',
@@ -830,6 +831,11 @@ Pod::Spec.new do |s|
                               'src/core/lib/compression/stream_compression_identity.h',
                               'src/core/lib/debug/stats.h',
                               'src/core/lib/debug/stats_data.h',
+                              'src/core/lib/gpr++/debug_location.h',
+                              'src/core/lib/gpr++/inlined_vector.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/http/format_request.h',
                               'src/core/lib/http/httpcli.h',
                               'src/core/lib/http/parser.h',
@@ -905,9 +911,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/slice/slice_hash_table.h',
                               'src/core/lib/slice/slice_internal.h',
                               'src/core/lib/slice/slice_string_helpers.h',
-                              'src/core/lib/support/debug_location.h',
-                              'src/core/lib/support/ref_counted.h',
-                              'src/core/lib/support/ref_counted_ptr.h',
                               'src/core/lib/surface/alarm_internal.h',
                               'src/core/lib/surface/api_trace.h',
                               'src/core/lib/surface/call.h',
@@ -968,7 +971,8 @@ Pod::Spec.new do |s|
     ss.dependency "#{s.name}/Cronet-Interface", version
 
     ss.source_files = 'src/core/ext/transport/cronet/client/secure/cronet_channel_create.cc',
-                      'src/core/ext/transport/cronet/transport/cronet_transport.{cc,h}',
+                      'src/core/ext/transport/cronet/transport/cronet_transport.cc',
+                      'src/core/ext/transport/cronet/transport/cronet_transport.h',
                       'third_party/objective_c/Cronet/bidirectional_stream_c.h'
   end
 
@@ -978,21 +982,116 @@ Pod::Spec.new do |s|
     ss.dependency "#{s.name}/Interface", version
     ss.dependency "#{s.name}/Implementation", version
 
-    ss.source_files = 'test/core/end2end/cq_verifier.{cc,h}',
-                      'test/core/end2end/end2end_tests.{cc,h}',
-                      'test/core/end2end/end2end_test_utils.cc',
-                      'test/core/end2end/tests/*.{cc,h}',
-                      'test/core/end2end/fixtures/*.h',
-                      'test/core/end2end/data/*.{cc,h}',
-                      'test/core/util/debugger_macros.{cc,h}',
-                      'test/core/util/test_config.{cc,h}',
-                      'test/core/util/port.h',
+    ss.source_files = 'test/core/util/test_config.cc',
+                      'test/core/util/test_config.h',
+                      'test/core/end2end/data/client_certs.cc',
+                      'test/core/end2end/data/server1_cert.cc',
+                      'test/core/end2end/data/server1_key.cc',
+                      'test/core/end2end/data/test_root_cert.cc',
+                      'test/core/security/oauth2_utils.cc',
+                      'test/core/end2end/cq_verifier.cc',
+                      'test/core/end2end/fixtures/http_proxy_fixture.cc',
+                      'test/core/end2end/fixtures/proxy.cc',
+                      'test/core/iomgr/endpoint_tests.cc',
+                      'test/core/util/debugger_macros.cc',
+                      'test/core/util/grpc_profiler.cc',
+                      'test/core/util/histogram.cc',
+                      'test/core/util/memory_counters.cc',
+                      'test/core/util/mock_endpoint.cc',
+                      'test/core/util/parse_hexstring.cc',
+                      'test/core/util/passthru_endpoint.cc',
                       'test/core/util/port.cc',
-                      'test/core/util/port_server_client.{cc,h}'
+                      'test/core/util/port_isolated_runtime_environment.cc',
+                      'test/core/util/port_server_client.cc',
+                      'test/core/util/slice_splitter.cc',
+                      'test/core/util/tracer_util.cc',
+                      'test/core/util/trickle_endpoint.cc',
+                      'test/core/end2end/data/ssl_test_data.h',
+                      'test/core/security/oauth2_utils.h',
+                      'test/core/end2end/cq_verifier.h',
+                      'test/core/end2end/fixtures/http_proxy_fixture.h',
+                      'test/core/end2end/fixtures/proxy.h',
+                      'test/core/iomgr/endpoint_tests.h',
+                      'test/core/util/debugger_macros.h',
+                      'test/core/util/grpc_profiler.h',
+                      'test/core/util/histogram.h',
+                      'test/core/util/memory_counters.h',
+                      'test/core/util/mock_endpoint.h',
+                      'test/core/util/parse_hexstring.h',
+                      'test/core/util/passthru_endpoint.h',
+                      'test/core/util/port.h',
+                      'test/core/util/port_server_client.h',
+                      'test/core/util/slice_splitter.h',
+                      'test/core/util/tracer_util.h',
+                      'test/core/util/trickle_endpoint.h',
+                      'test/core/end2end/end2end_tests.cc',
+                      'test/core/end2end/end2end_test_utils.cc',
+                      'test/core/end2end/tests/authority_not_supported.cc',
+                      'test/core/end2end/tests/bad_hostname.cc',
+                      'test/core/end2end/tests/bad_ping.cc',
+                      'test/core/end2end/tests/binary_metadata.cc',
+                      'test/core/end2end/tests/call_creds.cc',
+                      'test/core/end2end/tests/cancel_after_accept.cc',
+                      'test/core/end2end/tests/cancel_after_client_done.cc',
+                      'test/core/end2end/tests/cancel_after_invoke.cc',
+                      'test/core/end2end/tests/cancel_after_round_trip.cc',
+                      'test/core/end2end/tests/cancel_before_invoke.cc',
+                      'test/core/end2end/tests/cancel_in_a_vacuum.cc',
+                      'test/core/end2end/tests/cancel_with_status.cc',
+                      'test/core/end2end/tests/compressed_payload.cc',
+                      'test/core/end2end/tests/connectivity.cc',
+                      'test/core/end2end/tests/default_host.cc',
+                      'test/core/end2end/tests/disappearing_server.cc',
+                      'test/core/end2end/tests/empty_batch.cc',
+                      'test/core/end2end/tests/filter_call_init_fails.cc',
+                      'test/core/end2end/tests/filter_causes_close.cc',
+                      'test/core/end2end/tests/filter_latency.cc',
+                      'test/core/end2end/tests/filter_status_code.cc',
+                      'test/core/end2end/tests/graceful_server_shutdown.cc',
+                      'test/core/end2end/tests/high_initial_seqno.cc',
+                      'test/core/end2end/tests/hpack_size.cc',
+                      'test/core/end2end/tests/idempotent_request.cc',
+                      'test/core/end2end/tests/invoke_large_request.cc',
+                      'test/core/end2end/tests/keepalive_timeout.cc',
+                      'test/core/end2end/tests/large_metadata.cc',
+                      'test/core/end2end/tests/load_reporting_hook.cc',
+                      'test/core/end2end/tests/max_concurrent_streams.cc',
+                      'test/core/end2end/tests/max_connection_age.cc',
+                      'test/core/end2end/tests/max_connection_idle.cc',
+                      'test/core/end2end/tests/max_message_length.cc',
+                      'test/core/end2end/tests/negative_deadline.cc',
+                      'test/core/end2end/tests/network_status_change.cc',
+                      'test/core/end2end/tests/no_logging.cc',
+                      'test/core/end2end/tests/no_op.cc',
+                      'test/core/end2end/tests/payload.cc',
+                      'test/core/end2end/tests/ping.cc',
+                      'test/core/end2end/tests/ping_pong_streaming.cc',
+                      'test/core/end2end/tests/proxy_auth.cc',
+                      'test/core/end2end/tests/registered_call.cc',
+                      'test/core/end2end/tests/request_with_flags.cc',
+                      'test/core/end2end/tests/request_with_payload.cc',
+                      'test/core/end2end/tests/resource_quota_server.cc',
+                      'test/core/end2end/tests/server_finishes_request.cc',
+                      'test/core/end2end/tests/shutdown_finishes_calls.cc',
+                      'test/core/end2end/tests/shutdown_finishes_tags.cc',
+                      'test/core/end2end/tests/simple_cacheable_request.cc',
+                      'test/core/end2end/tests/simple_delayed_request.cc',
+                      'test/core/end2end/tests/simple_metadata.cc',
+                      'test/core/end2end/tests/simple_request.cc',
+                      'test/core/end2end/tests/stream_compression_compressed_payload.cc',
+                      'test/core/end2end/tests/stream_compression_payload.cc',
+                      'test/core/end2end/tests/stream_compression_ping_pong_streaming.cc',
+                      'test/core/end2end/tests/streaming_error_response.cc',
+                      'test/core/end2end/tests/trailing_metadata.cc',
+                      'test/core/end2end/tests/workaround_cronet_compression.cc',
+                      'test/core/end2end/tests/write_buffering.cc',
+                      'test/core/end2end/tests/write_buffering_at_end.cc',
+                      'test/core/end2end/tests/cancel_test_helpers.h',
+                      'test/core/end2end/end2end_tests.h'
   end
 
   # TODO (mxyan): Instead of this hack, add include path "third_party" to C core's include path?
   s.prepare_command = <<-END_OF_COMMAND
-    find src/core/ -type f -exec sed -E -i '.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
+    find src/core/ -type f -exec sed -E -i'.back' 's;#include "third_party/nanopb/(.*)";#include <nanopb/\\1>;g' {} \\\;
   END_OF_COMMAND
 end