Merge master

1 files changed, 48 insertions, 28 deletions

diff --git a/grpc.gyp b/grpc.gyp
index 8229b9689b..02992e763e 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -310,7 +310,6 @@
         'src/core/lib/iomgr/error.cc',
         'src/core/lib/iomgr/ev_epoll1_linux.cc',
         'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_epollsig_linux.cc',
         'src/core/lib/iomgr/ev_poll_posix.cc',
         'src/core/lib/iomgr/ev_posix.cc',
         'src/core/lib/iomgr/ev_windows.cc',
@@ -427,6 +426,7 @@
         'src/core/lib/transport/timeout_encoding.cc',
         'src/core/lib/transport/transport.cc',
         'src/core/lib/transport/transport_op_string.cc',
+        'src/core/lib/uri/uri_parser.cc',
         'src/core/lib/debug/trace.cc',
         'src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc',
         'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
@@ -474,11 +474,14 @@
         'src/core/lib/security/credentials/oauth2/oauth2_credentials.cc',
         'src/core/lib/security/credentials/plugin/plugin_credentials.cc',
         'src/core/lib/security/credentials/ssl/ssl_credentials.cc',
-        'src/core/lib/security/security_connector/alts_security_connector.cc',
+        'src/core/lib/security/security_connector/alts/alts_security_connector.cc',
+        'src/core/lib/security/security_connector/fake/fake_security_connector.cc',
         'src/core/lib/security/security_connector/load_system_roots_fallback.cc',
         'src/core/lib/security/security_connector/load_system_roots_linux.cc',
-        'src/core/lib/security/security_connector/local_security_connector.cc',
+        'src/core/lib/security/security_connector/local/local_security_connector.cc',
         'src/core/lib/security/security_connector/security_connector.cc',
+        'src/core/lib/security/security_connector/ssl/ssl_security_connector.cc',
+        'src/core/lib/security/security_connector/ssl_utils.cc',
         'src/core/lib/security/transport/client_auth_filter.cc',
         'src/core/lib/security/transport/secure_endpoint.cc',
         'src/core/lib/security/transport/security_handshaker.cc',
@@ -497,7 +500,7 @@
         'src/core/tsi/alts/frame_protector/alts_unseal_privacy_integrity_crypter.cc',
         'src/core/tsi/alts/frame_protector/frame_handler.cc',
         'src/core/tsi/alts/handshaker/alts_handshaker_client.cc',
-        'src/core/tsi/alts/handshaker/alts_tsi_event.cc',
+        'src/core/tsi/alts/handshaker/alts_shared_resource.cc',
         'src/core/tsi/alts/handshaker/alts_tsi_handshaker.cc',
         'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_integrity_only_record_protocol.cc',
         'src/core/tsi/alts/zero_copy_frame_protector/alts_grpc_privacy_integrity_record_protocol.cc',
@@ -533,6 +536,7 @@
         'src/core/ext/filters/client_channel/client_channel_factory.cc',
         'src/core/ext/filters/client_channel/client_channel_plugin.cc',
         'src/core/ext/filters/client_channel/connector.cc',
+        'src/core/ext/filters/client_channel/health/health_check_client.cc',
         'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
         'src/core/ext/filters/client_channel/http_proxy.cc',
         'src/core/ext/filters/client_channel/lb_policy.cc',
@@ -547,9 +551,8 @@
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
         'src/core/ext/filters/client_channel/subchannel_index.cc',
-        'src/core/ext/filters/client_channel/uri_parser.cc',
         'src/core/ext/filters/deadline/deadline_filter.cc',
-        'src/core/tsi/alts_transport_security.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
         'src/core/tsi/fake_transport_security.cc',
         'src/core/tsi/local_transport_security.cc',
         'src/core/tsi/ssl/session_cache/ssl_session_boringssl.cc',
@@ -568,10 +571,14 @@
         'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.cc',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc',
+        'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
-        'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel_secure.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc',
         'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
         'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
         'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
@@ -594,16 +601,6 @@
       ],
     },
     {
-      'target_name': 'grpc_dll',
-      'type': 'static_library',
-      'dependencies': [
-        'gpr',
-        'grpc',
-      ],
-      'sources': [
-      ],
-    },
-    {
       'target_name': 'grpc_test_util',
       'type': 'static_library',
       'dependencies': [
@@ -673,7 +670,6 @@
         'src/core/lib/iomgr/error.cc',
         'src/core/lib/iomgr/ev_epoll1_linux.cc',
         'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_epollsig_linux.cc',
         'src/core/lib/iomgr/ev_poll_posix.cc',
         'src/core/lib/iomgr/ev_posix.cc',
         'src/core/lib/iomgr/ev_windows.cc',
@@ -790,6 +786,7 @@
         'src/core/lib/transport/timeout_encoding.cc',
         'src/core/lib/transport/transport.cc',
         'src/core/lib/transport/transport_op_string.cc',
+        'src/core/lib/uri/uri_parser.cc',
         'src/core/lib/debug/trace.cc',
         'src/core/ext/filters/client_channel/backup_poller.cc',
         'src/core/ext/filters/client_channel/channel_connectivity.cc',
@@ -798,6 +795,7 @@
         'src/core/ext/filters/client_channel/client_channel_factory.cc',
         'src/core/ext/filters/client_channel/client_channel_plugin.cc',
         'src/core/ext/filters/client_channel/connector.cc',
+        'src/core/ext/filters/client_channel/health/health_check_client.cc',
         'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
         'src/core/ext/filters/client_channel/http_proxy.cc',
         'src/core/ext/filters/client_channel/lb_policy.cc',
@@ -812,8 +810,11 @@
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
         'src/core/ext/filters/client_channel/subchannel_index.cc',
-        'src/core/ext/filters/client_channel/uri_parser.cc',
         'src/core/ext/filters/deadline/deadline_filter.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
         'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
         'src/core/ext/transport/chttp2/transport/chttp2_plugin.cc',
@@ -909,7 +910,6 @@
         'src/core/lib/iomgr/error.cc',
         'src/core/lib/iomgr/ev_epoll1_linux.cc',
         'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_epollsig_linux.cc',
         'src/core/lib/iomgr/ev_poll_posix.cc',
         'src/core/lib/iomgr/ev_posix.cc',
         'src/core/lib/iomgr/ev_windows.cc',
@@ -1026,6 +1026,7 @@
         'src/core/lib/transport/timeout_encoding.cc',
         'src/core/lib/transport/transport.cc',
         'src/core/lib/transport/transport_op_string.cc',
+        'src/core/lib/uri/uri_parser.cc',
         'src/core/lib/debug/trace.cc',
         'src/core/ext/filters/client_channel/backup_poller.cc',
         'src/core/ext/filters/client_channel/channel_connectivity.cc',
@@ -1034,6 +1035,7 @@
         'src/core/ext/filters/client_channel/client_channel_factory.cc',
         'src/core/ext/filters/client_channel/client_channel_plugin.cc',
         'src/core/ext/filters/client_channel/connector.cc',
+        'src/core/ext/filters/client_channel/health/health_check_client.cc',
         'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
         'src/core/ext/filters/client_channel/http_proxy.cc',
         'src/core/ext/filters/client_channel/lb_policy.cc',
@@ -1048,8 +1050,11 @@
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
         'src/core/ext/filters/client_channel/subchannel_index.cc',
-        'src/core/ext/filters/client_channel/uri_parser.cc',
         'src/core/ext/filters/deadline/deadline_filter.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/core/ext/transport/chttp2/transport/bin_decoder.cc',
         'src/core/ext/transport/chttp2/transport/bin_encoder.cc',
         'src/core/ext/transport/chttp2/transport/chttp2_plugin.cc',
@@ -1123,7 +1128,6 @@
         'src/core/lib/iomgr/error.cc',
         'src/core/lib/iomgr/ev_epoll1_linux.cc',
         'src/core/lib/iomgr/ev_epollex_linux.cc',
-        'src/core/lib/iomgr/ev_epollsig_linux.cc',
         'src/core/lib/iomgr/ev_poll_posix.cc',
         'src/core/lib/iomgr/ev_posix.cc',
         'src/core/lib/iomgr/ev_windows.cc',
@@ -1240,6 +1244,7 @@
         'src/core/lib/transport/timeout_encoding.cc',
         'src/core/lib/transport/transport.cc',
         'src/core/lib/transport/transport_op_string.cc',
+        'src/core/lib/uri/uri_parser.cc',
         'src/core/lib/debug/trace.cc',
         'src/core/ext/transport/chttp2/server/insecure/server_chttp2.cc',
         'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.cc',
@@ -1283,6 +1288,7 @@
         'src/core/ext/filters/client_channel/client_channel_factory.cc',
         'src/core/ext/filters/client_channel/client_channel_plugin.cc',
         'src/core/ext/filters/client_channel/connector.cc',
+        'src/core/ext/filters/client_channel/health/health_check_client.cc',
         'src/core/ext/filters/client_channel/http_connect_handshaker.cc',
         'src/core/ext/filters/client_channel/http_proxy.cc',
         'src/core/ext/filters/client_channel/lb_policy.cc',
@@ -1297,8 +1303,11 @@
         'src/core/ext/filters/client_channel/retry_throttle.cc',
         'src/core/ext/filters/client_channel/subchannel.cc',
         'src/core/ext/filters/client_channel/subchannel_index.cc',
-        'src/core/ext/filters/client_channel/uri_parser.cc',
         'src/core/ext/filters/deadline/deadline_filter.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/core/ext/transport/inproc/inproc_plugin.cc',
         'src/core/ext/transport/inproc/inproc_transport.cc',
         'src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc',
@@ -1320,9 +1329,10 @@
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/duration.pb.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/google/protobuf/timestamp.pb.c',
         'src/core/ext/filters/client_channel/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c',
-        'third_party/nanopb/pb_common.c',
-        'third_party/nanopb/pb_decode.c',
-        'third_party/nanopb/pb_encode.c',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_channel.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_client_stats.cc',
+        'src/core/ext/filters/client_channel/lb_policy/xds/xds_load_balancer_api.cc',
         'src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc',
         'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
         'src/core/ext/filters/census/grpc_context.cc',
@@ -1379,6 +1389,7 @@
         'src/cpp/server/secure_server_credentials.cc',
         'src/cpp/client/channel_cc.cc',
         'src/cpp/client/client_context.cc',
+        'src/cpp/client/client_interceptor.cc',
         'src/cpp/client/create_channel.cc',
         'src/cpp/client/create_channel_internal.cc',
         'src/cpp/client/create_channel_posix.cc',
@@ -1397,7 +1408,6 @@
         'src/cpp/server/create_default_thread_pool.cc',
         'src/cpp/server/dynamic_thread_pool.cc',
         'src/cpp/server/health/default_health_check_service.cc',
-        'src/cpp/server/health/health.pb.c',
         'src/cpp/server/health/health_check_service.cc',
         'src/cpp/server/health/health_check_service_server_builder_option.cc',
         'src/cpp/server/server_builder.cc',
@@ -1410,6 +1420,10 @@
         'src/cpp/util/status.cc',
         'src/cpp/util/string_ref.cc',
         'src/cpp/util/time_cc.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/cpp/codegen/codegen_init.cc',
       ],
     },
@@ -1526,6 +1540,7 @@
         'src/cpp/server/insecure_server_credentials.cc',
         'src/cpp/client/channel_cc.cc',
         'src/cpp/client/client_context.cc',
+        'src/cpp/client/client_interceptor.cc',
         'src/cpp/client/create_channel.cc',
         'src/cpp/client/create_channel_internal.cc',
         'src/cpp/client/create_channel_posix.cc',
@@ -1544,7 +1559,6 @@
         'src/cpp/server/create_default_thread_pool.cc',
         'src/cpp/server/dynamic_thread_pool.cc',
         'src/cpp/server/health/default_health_check_service.cc',
-        'src/cpp/server/health/health.pb.c',
         'src/cpp/server/health/health_check_service.cc',
         'src/cpp/server/health/health_check_service_server_builder_option.cc',
         'src/cpp/server/server_builder.cc',
@@ -1557,6 +1571,10 @@
         'src/cpp/util/status.cc',
         'src/cpp/util/string_ref.cc',
         'src/cpp/util/time_cc.cc',
+        'src/core/ext/filters/client_channel/health/health.pb.c',
+        'third_party/nanopb/pb_common.c',
+        'third_party/nanopb/pb_decode.c',
+        'third_party/nanopb/pb_encode.c',
         'src/cpp/codegen/codegen_init.cc',
       ],
     },
@@ -1735,6 +1753,7 @@
         'src/proto/grpc/testing/worker_service.proto',
         'test/cpp/qps/benchmark_config.cc',
         'test/cpp/qps/client_async.cc',
+        'test/cpp/qps/client_callback.cc',
         'test/cpp/qps/client_sync.cc',
         'test/cpp/qps/driver.cc',
         'test/cpp/qps/parse_json.cc',
@@ -1742,6 +1761,7 @@
         'test/cpp/qps/qps_worker.cc',
         'test/cpp/qps/report.cc',
         'test/cpp/qps/server_async.cc',
+        'test/cpp/qps/server_callback.cc',
         'test/cpp/qps/server_sync.cc',
         'test/cpp/qps/usage_timer.cc',
       ],