Merge github.com:grpc/grpc into microbench

9 years ago · ac119ba887
parent 5282cdb025 9dd2c7da2f
commit ac119ba887
391 changed files with 29193 additions and 10488 deletions
--- a/196
+++ b/196
@ -200,27 +200,36 @@ cc_library(
    "src/core/lib/iomgr/pollset.h",
    "src/core/lib/iomgr/pollset_set.h",
    "src/core/lib/iomgr/pollset_set_windows.h",
    "src/core/lib/iomgr/pollset_uv.h",
    "src/core/lib/iomgr/pollset_windows.h",
    "src/core/lib/iomgr/port.h",
    "src/core/lib/iomgr/resolve_address.h",
    "src/core/lib/iomgr/resource_quota.h",
    "src/core/lib/iomgr/sockaddr.h",
    "src/core/lib/iomgr/sockaddr_posix.h",
    "src/core/lib/iomgr/sockaddr_utils.h",
    "src/core/lib/iomgr/sockaddr_windows.h",
    "src/core/lib/iomgr/socket_utils.h",
    "src/core/lib/iomgr/socket_utils_posix.h",
    "src/core/lib/iomgr/socket_windows.h",
    "src/core/lib/iomgr/tcp_client.h",
    "src/core/lib/iomgr/tcp_client_posix.h",
    "src/core/lib/iomgr/tcp_posix.h",
    "src/core/lib/iomgr/tcp_server.h",
    "src/core/lib/iomgr/tcp_uv.h",
    "src/core/lib/iomgr/tcp_windows.h",
    "src/core/lib/iomgr/time_averaged_stats.h",
    "src/core/lib/iomgr/timer.h",
    "src/core/lib/iomgr/timer_generic.h",
    "src/core/lib/iomgr/timer_heap.h",
    "src/core/lib/iomgr/timer_uv.h",
    "src/core/lib/iomgr/udp_server.h",
    "src/core/lib/iomgr/unix_sockets_posix.h",
    "src/core/lib/iomgr/wakeup_fd_cv.h",
    "src/core/lib/iomgr/wakeup_fd_pipe.h",
    "src/core/lib/iomgr/wakeup_fd_posix.h",
    "src/core/lib/iomgr/workqueue.h",
    "src/core/lib/iomgr/workqueue_uv.h",
    "src/core/lib/iomgr/workqueue_windows.h",
    "src/core/lib/json/json.h",
    "src/core/lib/json/json_common.h",
@ -242,6 +251,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.h",
    "src/core/lib/transport/metadata.h",
    "src/core/lib/transport/metadata_batch.h",
    "src/core/lib/transport/method_config.h",
    "src/core/lib/transport/static_metadata.h",
    "src/core/lib/transport/timeout_encoding.h",
    "src/core/lib/transport/transport.h",
@ -299,12 +309,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.h",
    "src/core/ext/client_channel/lb_policy_factory.h",
    "src/core/ext/client_channel/lb_policy_registry.h",
    "src/core/ext/client_channel/method_config.h",
    "src/core/ext/client_channel/parse_address.h",
    "src/core/ext/client_channel/resolver.h",
    "src/core/ext/client_channel/resolver_factory.h",
    "src/core/ext/client_channel/resolver_registry.h",
    "src/core/ext/client_channel/resolver_result.h",
    "src/core/ext/client_channel/subchannel.h",
    "src/core/ext/client_channel/subchannel_index.h",
    "src/core/ext/client_channel/uri_parser.h",
@ -345,6 +353,7 @@ cc_library(
    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_uv.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
@ -356,28 +365,39 @@ cc_library(
    "src/core/lib/iomgr/iocp_windows.c",
    "src/core/lib/iomgr/iomgr.c",
    "src/core/lib/iomgr/iomgr_posix.c",
    "src/core/lib/iomgr/iomgr_uv.c",
    "src/core/lib/iomgr/iomgr_windows.c",
    "src/core/lib/iomgr/load_file.c",
    "src/core/lib/iomgr/network_status_tracker.c",
    "src/core/lib/iomgr/polling_entity.c",
    "src/core/lib/iomgr/pollset_set_uv.c",
    "src/core/lib/iomgr/pollset_set_windows.c",
    "src/core/lib/iomgr/pollset_uv.c",
    "src/core/lib/iomgr/pollset_windows.c",
    "src/core/lib/iomgr/resolve_address_posix.c",
    "src/core/lib/iomgr/resolve_address_uv.c",
    "src/core/lib/iomgr/resolve_address_windows.c",
    "src/core/lib/iomgr/resource_quota.c",
    "src/core/lib/iomgr/sockaddr_utils.c",
    "src/core/lib/iomgr/socket_utils_common_posix.c",
    "src/core/lib/iomgr/socket_utils_linux.c",
    "src/core/lib/iomgr/socket_utils_posix.c",
    "src/core/lib/iomgr/socket_utils_uv.c",
    "src/core/lib/iomgr/socket_utils_windows.c",
    "src/core/lib/iomgr/socket_windows.c",
    "src/core/lib/iomgr/tcp_client_posix.c",
    "src/core/lib/iomgr/tcp_client_uv.c",
    "src/core/lib/iomgr/tcp_client_windows.c",
    "src/core/lib/iomgr/tcp_posix.c",
    "src/core/lib/iomgr/tcp_server_posix.c",
    "src/core/lib/iomgr/tcp_server_uv.c",
    "src/core/lib/iomgr/tcp_server_windows.c",
    "src/core/lib/iomgr/tcp_uv.c",
    "src/core/lib/iomgr/tcp_windows.c",
    "src/core/lib/iomgr/time_averaged_stats.c",
-    "src/core/lib/iomgr/timer.c",
+    "src/core/lib/iomgr/timer_generic.c",
    "src/core/lib/iomgr/timer_heap.c",
    "src/core/lib/iomgr/timer_uv.c",
    "src/core/lib/iomgr/udp_server.c",
    "src/core/lib/iomgr/unix_sockets_posix.c",
    "src/core/lib/iomgr/unix_sockets_posix_noop.c",
@ -386,6 +406,7 @@ cc_library(
    "src/core/lib/iomgr/wakeup_fd_nospecial.c",
    "src/core/lib/iomgr/wakeup_fd_pipe.c",
    "src/core/lib/iomgr/wakeup_fd_posix.c",
    "src/core/lib/iomgr/workqueue_uv.c",
    "src/core/lib/iomgr/workqueue_windows.c",
    "src/core/lib/json/json.c",
    "src/core/lib/json/json_reader.c",
@ -414,6 +435,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.c",
    "src/core/lib/transport/metadata.c",
    "src/core/lib/transport/metadata_batch.c",
    "src/core/lib/transport/method_config.c",
    "src/core/lib/transport/static_metadata.c",
    "src/core/lib/transport/timeout_encoding.c",
    "src/core/lib/transport/transport.c",
@ -447,8 +469,7 @@ cc_library(
    "src/core/lib/security/credentials/credentials.c",
    "src/core/lib/security/credentials/credentials_metadata.c",
    "src/core/lib/security/credentials/fake/fake_credentials.c",
-    "src/core/lib/security/credentials/google_default/credentials_posix.c",
+    "src/core/lib/security/credentials/google_default/credentials_generic.c",
    "src/core/lib/security/credentials/google_default/credentials_windows.c",
    "src/core/lib/security/credentials/google_default/google_default_credentials.c",
    "src/core/lib/security/credentials/iam/iam_credentials.c",
    "src/core/lib/security/credentials/jwt/json_token.c",
@ -481,12 +502,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.c",
    "src/core/ext/client_channel/lb_policy_factory.c",
    "src/core/ext/client_channel/lb_policy_registry.c",
    "src/core/ext/client_channel/method_config.c",
    "src/core/ext/client_channel/parse_address.c",
    "src/core/ext/client_channel/resolver.c",
    "src/core/ext/client_channel/resolver_factory.c",
    "src/core/ext/client_channel/resolver_registry.c",
    "src/core/ext/client_channel/resolver_result.c",
    "src/core/ext/client_channel/subchannel.c",
    "src/core/ext/client_channel/subchannel_index.c",
    "src/core/ext/client_channel/uri_parser.c",
@ -605,27 +624,36 @@ cc_library(
    "src/core/lib/iomgr/pollset.h",
    "src/core/lib/iomgr/pollset_set.h",
    "src/core/lib/iomgr/pollset_set_windows.h",
    "src/core/lib/iomgr/pollset_uv.h",
    "src/core/lib/iomgr/pollset_windows.h",
    "src/core/lib/iomgr/port.h",
    "src/core/lib/iomgr/resolve_address.h",
    "src/core/lib/iomgr/resource_quota.h",
    "src/core/lib/iomgr/sockaddr.h",
    "src/core/lib/iomgr/sockaddr_posix.h",
    "src/core/lib/iomgr/sockaddr_utils.h",
    "src/core/lib/iomgr/sockaddr_windows.h",
    "src/core/lib/iomgr/socket_utils.h",
    "src/core/lib/iomgr/socket_utils_posix.h",
    "src/core/lib/iomgr/socket_windows.h",
    "src/core/lib/iomgr/tcp_client.h",
    "src/core/lib/iomgr/tcp_client_posix.h",
    "src/core/lib/iomgr/tcp_posix.h",
    "src/core/lib/iomgr/tcp_server.h",
    "src/core/lib/iomgr/tcp_uv.h",
    "src/core/lib/iomgr/tcp_windows.h",
    "src/core/lib/iomgr/time_averaged_stats.h",
    "src/core/lib/iomgr/timer.h",
    "src/core/lib/iomgr/timer_generic.h",
    "src/core/lib/iomgr/timer_heap.h",
    "src/core/lib/iomgr/timer_uv.h",
    "src/core/lib/iomgr/udp_server.h",
    "src/core/lib/iomgr/unix_sockets_posix.h",
    "src/core/lib/iomgr/wakeup_fd_cv.h",
    "src/core/lib/iomgr/wakeup_fd_pipe.h",
    "src/core/lib/iomgr/wakeup_fd_posix.h",
    "src/core/lib/iomgr/workqueue.h",
    "src/core/lib/iomgr/workqueue_uv.h",
    "src/core/lib/iomgr/workqueue_windows.h",
    "src/core/lib/json/json.h",
    "src/core/lib/json/json_common.h",
@ -647,6 +675,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.h",
    "src/core/lib/transport/metadata.h",
    "src/core/lib/transport/metadata_batch.h",
    "src/core/lib/transport/method_config.h",
    "src/core/lib/transport/static_metadata.h",
    "src/core/lib/transport/timeout_encoding.h",
    "src/core/lib/transport/transport.h",
@ -681,12 +710,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.h",
    "src/core/ext/client_channel/lb_policy_factory.h",
    "src/core/ext/client_channel/lb_policy_registry.h",
    "src/core/ext/client_channel/method_config.h",
    "src/core/ext/client_channel/parse_address.h",
    "src/core/ext/client_channel/resolver.h",
    "src/core/ext/client_channel/resolver_factory.h",
    "src/core/ext/client_channel/resolver_registry.h",
    "src/core/ext/client_channel/resolver_result.h",
    "src/core/ext/client_channel/subchannel.h",
    "src/core/ext/client_channel/subchannel_index.h",
    "src/core/ext/client_channel/uri_parser.h",
@ -735,6 +762,7 @@ cc_library(
    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_uv.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
@ -746,28 +774,39 @@ cc_library(
    "src/core/lib/iomgr/iocp_windows.c",
    "src/core/lib/iomgr/iomgr.c",
    "src/core/lib/iomgr/iomgr_posix.c",
    "src/core/lib/iomgr/iomgr_uv.c",
    "src/core/lib/iomgr/iomgr_windows.c",
    "src/core/lib/iomgr/load_file.c",
    "src/core/lib/iomgr/network_status_tracker.c",
    "src/core/lib/iomgr/polling_entity.c",
    "src/core/lib/iomgr/pollset_set_uv.c",
    "src/core/lib/iomgr/pollset_set_windows.c",
    "src/core/lib/iomgr/pollset_uv.c",
    "src/core/lib/iomgr/pollset_windows.c",
    "src/core/lib/iomgr/resolve_address_posix.c",
    "src/core/lib/iomgr/resolve_address_uv.c",
    "src/core/lib/iomgr/resolve_address_windows.c",
    "src/core/lib/iomgr/resource_quota.c",
    "src/core/lib/iomgr/sockaddr_utils.c",
    "src/core/lib/iomgr/socket_utils_common_posix.c",
    "src/core/lib/iomgr/socket_utils_linux.c",
    "src/core/lib/iomgr/socket_utils_posix.c",
    "src/core/lib/iomgr/socket_utils_uv.c",
    "src/core/lib/iomgr/socket_utils_windows.c",
    "src/core/lib/iomgr/socket_windows.c",
    "src/core/lib/iomgr/tcp_client_posix.c",
    "src/core/lib/iomgr/tcp_client_uv.c",
    "src/core/lib/iomgr/tcp_client_windows.c",
    "src/core/lib/iomgr/tcp_posix.c",
    "src/core/lib/iomgr/tcp_server_posix.c",
    "src/core/lib/iomgr/tcp_server_uv.c",
    "src/core/lib/iomgr/tcp_server_windows.c",
    "src/core/lib/iomgr/tcp_uv.c",
    "src/core/lib/iomgr/tcp_windows.c",
    "src/core/lib/iomgr/time_averaged_stats.c",
-    "src/core/lib/iomgr/timer.c",
+    "src/core/lib/iomgr/timer_generic.c",
    "src/core/lib/iomgr/timer_heap.c",
    "src/core/lib/iomgr/timer_uv.c",
    "src/core/lib/iomgr/udp_server.c",
    "src/core/lib/iomgr/unix_sockets_posix.c",
    "src/core/lib/iomgr/unix_sockets_posix_noop.c",
@ -776,6 +815,7 @@ cc_library(
    "src/core/lib/iomgr/wakeup_fd_nospecial.c",
    "src/core/lib/iomgr/wakeup_fd_pipe.c",
    "src/core/lib/iomgr/wakeup_fd_posix.c",
    "src/core/lib/iomgr/workqueue_uv.c",
    "src/core/lib/iomgr/workqueue_windows.c",
    "src/core/lib/json/json.c",
    "src/core/lib/json/json_reader.c",
@ -804,6 +844,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.c",
    "src/core/lib/transport/metadata.c",
    "src/core/lib/transport/metadata_batch.c",
    "src/core/lib/transport/method_config.c",
    "src/core/lib/transport/static_metadata.c",
    "src/core/lib/transport/timeout_encoding.c",
    "src/core/lib/transport/transport.c",
@ -845,12 +886,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.c",
    "src/core/ext/client_channel/lb_policy_factory.c",
    "src/core/ext/client_channel/lb_policy_registry.c",
    "src/core/ext/client_channel/method_config.c",
    "src/core/ext/client_channel/parse_address.c",
    "src/core/ext/client_channel/resolver.c",
    "src/core/ext/client_channel/resolver_factory.c",
    "src/core/ext/client_channel/resolver_registry.c",
    "src/core/ext/client_channel/resolver_result.c",
    "src/core/ext/client_channel/subchannel.c",
    "src/core/ext/client_channel/subchannel_index.c",
    "src/core/ext/client_channel/uri_parser.c",
@ -860,8 +899,7 @@ cc_library(
    "src/core/lib/security/credentials/credentials.c",
    "src/core/lib/security/credentials/credentials_metadata.c",
    "src/core/lib/security/credentials/fake/fake_credentials.c",
-    "src/core/lib/security/credentials/google_default/credentials_posix.c",
+    "src/core/lib/security/credentials/google_default/credentials_generic.c",
    "src/core/lib/security/credentials/google_default/credentials_windows.c",
    "src/core/lib/security/credentials/google_default/google_default_credentials.c",
    "src/core/lib/security/credentials/iam/iam_credentials.c",
    "src/core/lib/security/credentials/jwt/json_token.c",
@ -965,27 +1003,36 @@ cc_library(
    "src/core/lib/iomgr/pollset.h",
    "src/core/lib/iomgr/pollset_set.h",
    "src/core/lib/iomgr/pollset_set_windows.h",
    "src/core/lib/iomgr/pollset_uv.h",
    "src/core/lib/iomgr/pollset_windows.h",
    "src/core/lib/iomgr/port.h",
    "src/core/lib/iomgr/resolve_address.h",
    "src/core/lib/iomgr/resource_quota.h",
    "src/core/lib/iomgr/sockaddr.h",
    "src/core/lib/iomgr/sockaddr_posix.h",
    "src/core/lib/iomgr/sockaddr_utils.h",
    "src/core/lib/iomgr/sockaddr_windows.h",
    "src/core/lib/iomgr/socket_utils.h",
    "src/core/lib/iomgr/socket_utils_posix.h",
    "src/core/lib/iomgr/socket_windows.h",
    "src/core/lib/iomgr/tcp_client.h",
    "src/core/lib/iomgr/tcp_client_posix.h",
    "src/core/lib/iomgr/tcp_posix.h",
    "src/core/lib/iomgr/tcp_server.h",
    "src/core/lib/iomgr/tcp_uv.h",
    "src/core/lib/iomgr/tcp_windows.h",
    "src/core/lib/iomgr/time_averaged_stats.h",
    "src/core/lib/iomgr/timer.h",
    "src/core/lib/iomgr/timer_generic.h",
    "src/core/lib/iomgr/timer_heap.h",
    "src/core/lib/iomgr/timer_uv.h",
    "src/core/lib/iomgr/udp_server.h",
    "src/core/lib/iomgr/unix_sockets_posix.h",
    "src/core/lib/iomgr/wakeup_fd_cv.h",
    "src/core/lib/iomgr/wakeup_fd_pipe.h",
    "src/core/lib/iomgr/wakeup_fd_posix.h",
    "src/core/lib/iomgr/workqueue.h",
    "src/core/lib/iomgr/workqueue_uv.h",
    "src/core/lib/iomgr/workqueue_windows.h",
    "src/core/lib/json/json.h",
    "src/core/lib/json/json_common.h",
@ -1007,6 +1054,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.h",
    "src/core/lib/transport/metadata.h",
    "src/core/lib/transport/metadata_batch.h",
    "src/core/lib/transport/method_config.h",
    "src/core/lib/transport/static_metadata.h",
    "src/core/lib/transport/timeout_encoding.h",
    "src/core/lib/transport/transport.h",
@ -1040,12 +1088,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.h",
    "src/core/ext/client_channel/lb_policy_factory.h",
    "src/core/ext/client_channel/lb_policy_registry.h",
    "src/core/ext/client_channel/method_config.h",
    "src/core/ext/client_channel/parse_address.h",
    "src/core/ext/client_channel/resolver.h",
    "src/core/ext/client_channel/resolver_factory.h",
    "src/core/ext/client_channel/resolver_registry.h",
    "src/core/ext/client_channel/resolver_result.h",
    "src/core/ext/client_channel/subchannel.h",
    "src/core/ext/client_channel/subchannel_index.h",
    "src/core/ext/client_channel/uri_parser.h",
@ -1087,6 +1133,7 @@ cc_library(
    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_uv.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
@ -1098,28 +1145,39 @@ cc_library(
    "src/core/lib/iomgr/iocp_windows.c",
    "src/core/lib/iomgr/iomgr.c",
    "src/core/lib/iomgr/iomgr_posix.c",
    "src/core/lib/iomgr/iomgr_uv.c",
    "src/core/lib/iomgr/iomgr_windows.c",
    "src/core/lib/iomgr/load_file.c",
    "src/core/lib/iomgr/network_status_tracker.c",
    "src/core/lib/iomgr/polling_entity.c",
    "src/core/lib/iomgr/pollset_set_uv.c",
    "src/core/lib/iomgr/pollset_set_windows.c",
    "src/core/lib/iomgr/pollset_uv.c",
    "src/core/lib/iomgr/pollset_windows.c",
    "src/core/lib/iomgr/resolve_address_posix.c",
    "src/core/lib/iomgr/resolve_address_uv.c",
    "src/core/lib/iomgr/resolve_address_windows.c",
    "src/core/lib/iomgr/resource_quota.c",
    "src/core/lib/iomgr/sockaddr_utils.c",
    "src/core/lib/iomgr/socket_utils_common_posix.c",
    "src/core/lib/iomgr/socket_utils_linux.c",
    "src/core/lib/iomgr/socket_utils_posix.c",
    "src/core/lib/iomgr/socket_utils_uv.c",
    "src/core/lib/iomgr/socket_utils_windows.c",
    "src/core/lib/iomgr/socket_windows.c",
    "src/core/lib/iomgr/tcp_client_posix.c",
    "src/core/lib/iomgr/tcp_client_uv.c",
    "src/core/lib/iomgr/tcp_client_windows.c",
    "src/core/lib/iomgr/tcp_posix.c",
    "src/core/lib/iomgr/tcp_server_posix.c",
    "src/core/lib/iomgr/tcp_server_uv.c",
    "src/core/lib/iomgr/tcp_server_windows.c",
    "src/core/lib/iomgr/tcp_uv.c",
    "src/core/lib/iomgr/tcp_windows.c",
    "src/core/lib/iomgr/time_averaged_stats.c",
-    "src/core/lib/iomgr/timer.c",
+    "src/core/lib/iomgr/timer_generic.c",
    "src/core/lib/iomgr/timer_heap.c",
    "src/core/lib/iomgr/timer_uv.c",
    "src/core/lib/iomgr/udp_server.c",
    "src/core/lib/iomgr/unix_sockets_posix.c",
    "src/core/lib/iomgr/unix_sockets_posix_noop.c",
@ -1128,6 +1186,7 @@ cc_library(
    "src/core/lib/iomgr/wakeup_fd_nospecial.c",
    "src/core/lib/iomgr/wakeup_fd_pipe.c",
    "src/core/lib/iomgr/wakeup_fd_posix.c",
    "src/core/lib/iomgr/workqueue_uv.c",
    "src/core/lib/iomgr/workqueue_windows.c",
    "src/core/lib/json/json.c",
    "src/core/lib/json/json_reader.c",
@ -1156,6 +1215,7 @@ cc_library(
    "src/core/lib/transport/mdstr_hash_table.c",
    "src/core/lib/transport/metadata.c",
    "src/core/lib/transport/metadata_batch.c",
    "src/core/lib/transport/method_config.c",
    "src/core/lib/transport/static_metadata.c",
    "src/core/lib/transport/timeout_encoding.c",
    "src/core/lib/transport/transport.c",
@ -1197,12 +1257,10 @@ cc_library(
    "src/core/ext/client_channel/lb_policy.c",
    "src/core/ext/client_channel/lb_policy_factory.c",
    "src/core/ext/client_channel/lb_policy_registry.c",
    "src/core/ext/client_channel/method_config.c",
    "src/core/ext/client_channel/parse_address.c",
    "src/core/ext/client_channel/resolver.c",
    "src/core/ext/client_channel/resolver_factory.c",
    "src/core/ext/client_channel/resolver_registry.c",
    "src/core/ext/client_channel/resolver_result.c",
    "src/core/ext/client_channel/subchannel.c",
    "src/core/ext/client_channel/subchannel_index.c",
    "src/core/ext/client_channel/uri_parser.c",
@ -1284,6 +1342,7 @@ cc_library(
    "src/cpp/common/channel_filter.h",
    "src/cpp/server/dynamic_thread_pool.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/cpp/client/insecure_credentials.cc",
    "src/cpp/client/secure_credentials.cc",
    "src/cpp/common/auth_property_iterator.cc",
@ -1303,6 +1362,7 @@ cc_library(
    "src/cpp/common/channel_filter.cc",
    "src/cpp/common/completion_queue_cc.cc",
    "src/cpp/common/core_codegen.cc",
    "src/cpp/common/resource_quota_cc.cc",
    "src/cpp/common/rpc_method.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
@ -1312,6 +1372,7 @@ cc_library(
    "src/cpp/server/server_context.cc",
    "src/cpp/server/server_credentials.cc",
    "src/cpp/server/server_posix.cc",
    "src/cpp/thread_manager/thread_manager.cc",
    "src/cpp/util/byte_buffer_cc.cc",
    "src/cpp/util/slice_cc.cc",
    "src/cpp/util/status.cc",
@ -1347,6 +1408,7 @@ cc_library(
    "include/grpc++/impl/thd.h",
    "include/grpc++/impl/thd_cxx11.h",
    "include/grpc++/impl/thd_no_cxx11.h",
    "include/grpc++/resource_quota.h",
    "include/grpc++/security/auth_context.h",
    "include/grpc++/security/auth_metadata_processor.h",
    "include/grpc++/security/credentials.h",
@ -1436,6 +1498,7 @@ cc_library(
    "src/cpp/common/channel_filter.h",
    "src/cpp/server/dynamic_thread_pool.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/cpp/client/cronet_credentials.cc",
    "src/cpp/client/insecure_credentials.cc",
    "src/cpp/common/insecure_create_auth_context.cc",
@ -1451,6 +1514,7 @@ cc_library(
    "src/cpp/common/channel_filter.cc",
    "src/cpp/common/completion_queue_cc.cc",
    "src/cpp/common/core_codegen.cc",
    "src/cpp/common/resource_quota_cc.cc",
    "src/cpp/common/rpc_method.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
@ -1460,6 +1524,7 @@ cc_library(
    "src/cpp/server/server_context.cc",
    "src/cpp/server/server_credentials.cc",
    "src/cpp/server/server_posix.cc",
    "src/cpp/thread_manager/thread_manager.cc",
    "src/cpp/util/byte_buffer_cc.cc",
    "src/cpp/util/slice_cc.cc",
    "src/cpp/util/status.cc",
@ -1495,6 +1560,7 @@ cc_library(
    "include/grpc++/impl/thd.h",
    "include/grpc++/impl/thd_cxx11.h",
    "include/grpc++/impl/thd_no_cxx11.h",
    "include/grpc++/resource_quota.h",
    "include/grpc++/security/auth_context.h",
    "include/grpc++/security/auth_metadata_processor.h",
    "include/grpc++/security/credentials.h",
@ -1583,63 +1649,10 @@ cc_library(
    "src/cpp/ext/proto_server_reflection.h",
    "src/cpp/ext/proto_server_reflection.cc",
    "src/cpp/ext/proto_server_reflection_plugin.cc",
-    "src/cpp/ext/reflection.grpc.pb.cc",
+    "src/proto/grpc/reflection/v1alpha/reflection.proto",
    "src/cpp/ext/reflection.pb.cc",
  ],
  hdrs = [
    "include/grpc++/ext/proto_server_reflection_plugin.h",
    "include/grpc++/ext/reflection.grpc.pb.h",
    "include/grpc++/ext/reflection.pb.h",
    "include/grpc++/impl/codegen/proto_utils.h",
    "include/grpc++/impl/codegen/async_stream.h",
    "include/grpc++/impl/codegen/async_unary_call.h",
    "include/grpc++/impl/codegen/call.h",
    "include/grpc++/impl/codegen/call_hook.h",
    "include/grpc++/impl/codegen/channel_interface.h",
    "include/grpc++/impl/codegen/client_context.h",
    "include/grpc++/impl/codegen/client_unary_call.h",
    "include/grpc++/impl/codegen/completion_queue.h",
    "include/grpc++/impl/codegen/completion_queue_tag.h",
    "include/grpc++/impl/codegen/config.h",
    "include/grpc++/impl/codegen/core_codegen_interface.h",
    "include/grpc++/impl/codegen/create_auth_context.h",
    "include/grpc++/impl/codegen/grpc_library.h",
    "include/grpc++/impl/codegen/method_handler_impl.h",
    "include/grpc++/impl/codegen/rpc_method.h",
    "include/grpc++/impl/codegen/rpc_service_method.h",
    "include/grpc++/impl/codegen/security/auth_context.h",
    "include/grpc++/impl/codegen/serialization_traits.h",
    "include/grpc++/impl/codegen/server_context.h",
    "include/grpc++/impl/codegen/server_interface.h",
    "include/grpc++/impl/codegen/service_type.h",
    "include/grpc++/impl/codegen/status.h",
    "include/grpc++/impl/codegen/status_code_enum.h",
    "include/grpc++/impl/codegen/status_helper.h",
    "include/grpc++/impl/codegen/string_ref.h",
    "include/grpc++/impl/codegen/stub_options.h",
    "include/grpc++/impl/codegen/sync.h",
    "include/grpc++/impl/codegen/sync_cxx11.h",
    "include/grpc++/impl/codegen/sync_no_cxx11.h",
    "include/grpc++/impl/codegen/sync_stream.h",
    "include/grpc++/impl/codegen/time.h",
    "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/grpc_types.h",
    "include/grpc/impl/codegen/propagation_bits.h",
    "include/grpc/impl/codegen/status.h",
    "include/grpc/impl/codegen/atm.h",
    "include/grpc/impl/codegen/atm_gcc_atomic.h",
    "include/grpc/impl/codegen/atm_gcc_sync.h",
    "include/grpc/impl/codegen/atm_windows.h",
    "include/grpc/impl/codegen/gpr_types.h",
    "include/grpc/impl/codegen/port_platform.h",
    "include/grpc/impl/codegen/slice.h",
    "include/grpc/impl/codegen/sync.h",
    "include/grpc/impl/codegen/sync_generic.h",
    "include/grpc/impl/codegen/sync_posix.h",
    "include/grpc/impl/codegen/sync_windows.h",
    "include/grpc++/impl/codegen/config_protobuf.h",
  ],
  includes = [
    "include",
@ -1659,6 +1672,7 @@ cc_library(
    "src/cpp/common/channel_filter.h",
    "src/cpp/server/dynamic_thread_pool.h",
    "src/cpp/server/thread_pool_interface.h",
    "src/cpp/thread_manager/thread_manager.h",
    "src/cpp/client/insecure_credentials.cc",
    "src/cpp/common/insecure_create_auth_context.cc",
    "src/cpp/server/insecure_server_credentials.cc",
@ -1673,6 +1687,7 @@ cc_library(
    "src/cpp/common/channel_filter.cc",
    "src/cpp/common/completion_queue_cc.cc",
    "src/cpp/common/core_codegen.cc",
    "src/cpp/common/resource_quota_cc.cc",
    "src/cpp/common/rpc_method.cc",
    "src/cpp/server/async_generic_service.cc",
    "src/cpp/server/create_default_thread_pool.cc",
@ -1682,6 +1697,7 @@ cc_library(
    "src/cpp/server/server_context.cc",
    "src/cpp/server/server_credentials.cc",
    "src/cpp/server/server_posix.cc",
    "src/cpp/thread_manager/thread_manager.cc",
    "src/cpp/util/byte_buffer_cc.cc",
    "src/cpp/util/slice_cc.cc",
    "src/cpp/util/status.cc",
@ -1717,6 +1733,7 @@ cc_library(
    "include/grpc++/impl/thd.h",
    "include/grpc++/impl/thd_cxx11.h",
    "include/grpc++/impl/thd_no_cxx11.h",
    "include/grpc++/resource_quota.h",
    "include/grpc++/security/auth_context.h",
    "include/grpc++/security/auth_metadata_processor.h",
    "include/grpc++/security/credentials.h",
@ -2000,6 +2017,7 @@ objc_library(
    "src/core/lib/iomgr/combiner.c",
    "src/core/lib/iomgr/endpoint.c",
    "src/core/lib/iomgr/endpoint_pair_posix.c",
    "src/core/lib/iomgr/endpoint_pair_uv.c",
    "src/core/lib/iomgr/endpoint_pair_windows.c",
    "src/core/lib/iomgr/error.c",
    "src/core/lib/iomgr/ev_epoll_linux.c",
@ -2011,28 +2029,39 @@ objc_library(
    "src/core/lib/iomgr/iocp_windows.c",
    "src/core/lib/iomgr/iomgr.c",
    "src/core/lib/iomgr/iomgr_posix.c",
    "src/core/lib/iomgr/iomgr_uv.c",
    "src/core/lib/iomgr/iomgr_windows.c",
    "src/core/lib/iomgr/load_file.c",
    "src/core/lib/iomgr/network_status_tracker.c",
    "src/core/lib/iomgr/polling_entity.c",
    "src/core/lib/iomgr/pollset_set_uv.c",
    "src/core/lib/iomgr/pollset_set_windows.c",
    "src/core/lib/iomgr/pollset_uv.c",
    "src/core/lib/iomgr/pollset_windows.c",
    "src/core/lib/iomgr/resolve_address_posix.c",
    "src/core/lib/iomgr/resolve_address_uv.c",
    "src/core/lib/iomgr/resolve_address_windows.c",
    "src/core/lib/iomgr/resource_quota.c",
    "src/core/lib/iomgr/sockaddr_utils.c",
    "src/core/lib/iomgr/socket_utils_common_posix.c",
    "src/core/lib/iomgr/socket_utils_linux.c",
    "src/core/lib/iomgr/socket_utils_posix.c",
    "src/core/lib/iomgr/socket_utils_uv.c",
    "src/core/lib/iomgr/socket_utils_windows.c",
    "src/core/lib/iomgr/socket_windows.c",
    "src/core/lib/iomgr/tcp_client_posix.c",
    "src/core/lib/iomgr/tcp_client_uv.c",
    "src/core/lib/iomgr/tcp_client_windows.c",
    "src/core/lib/iomgr/tcp_posix.c",
    "src/core/lib/iomgr/tcp_server_posix.c",
    "src/core/lib/iomgr/tcp_server_uv.c",
    "src/core/lib/iomgr/tcp_server_windows.c",
    "src/core/lib/iomgr/tcp_uv.c",
    "src/core/lib/iomgr/tcp_windows.c",
    "src/core/lib/iomgr/time_averaged_stats.c",
-    "src/core/lib/iomgr/timer.c",
+    "src/core/lib/iomgr/timer_generic.c",
    "src/core/lib/iomgr/timer_heap.c",
    "src/core/lib/iomgr/timer_uv.c",
    "src/core/lib/iomgr/udp_server.c",
    "src/core/lib/iomgr/unix_sockets_posix.c",
    "src/core/lib/iomgr/unix_sockets_posix_noop.c",
@ -2041,6 +2070,7 @@ objc_library(
    "src/core/lib/iomgr/wakeup_fd_nospecial.c",
    "src/core/lib/iomgr/wakeup_fd_pipe.c",
    "src/core/lib/iomgr/wakeup_fd_posix.c",
    "src/core/lib/iomgr/workqueue_uv.c",
    "src/core/lib/iomgr/workqueue_windows.c",
    "src/core/lib/json/json.c",
    "src/core/lib/json/json_reader.c",
@ -2069,6 +2099,7 @@ objc_library(
    "src/core/lib/transport/mdstr_hash_table.c",
    "src/core/lib/transport/metadata.c",
    "src/core/lib/transport/metadata_batch.c",
    "src/core/lib/transport/method_config.c",
    "src/core/lib/transport/static_metadata.c",
    "src/core/lib/transport/timeout_encoding.c",
    "src/core/lib/transport/transport.c",
@ -2102,8 +2133,7 @@ objc_library(
    "src/core/lib/security/credentials/credentials.c",
    "src/core/lib/security/credentials/credentials_metadata.c",
    "src/core/lib/security/credentials/fake/fake_credentials.c",
-    "src/core/lib/security/credentials/google_default/credentials_posix.c",
+    "src/core/lib/security/credentials/google_default/credentials_generic.c",
    "src/core/lib/security/credentials/google_default/credentials_windows.c",
    "src/core/lib/security/credentials/google_default/google_default_credentials.c",
    "src/core/lib/security/credentials/iam/iam_credentials.c",
    "src/core/lib/security/credentials/jwt/json_token.c",
@ -2136,12 +2166,10 @@ objc_library(
    "src/core/ext/client_channel/lb_policy.c",
    "src/core/ext/client_channel/lb_policy_factory.c",
    "src/core/ext/client_channel/lb_policy_registry.c",
    "src/core/ext/client_channel/method_config.c",
    "src/core/ext/client_channel/parse_address.c",
    "src/core/ext/client_channel/resolver.c",
    "src/core/ext/client_channel/resolver_factory.c",
    "src/core/ext/client_channel/resolver_registry.c",
    "src/core/ext/client_channel/resolver_result.c",
    "src/core/ext/client_channel/subchannel.c",
    "src/core/ext/client_channel/subchannel_index.c",
    "src/core/ext/client_channel/uri_parser.c",
@ -2239,27 +2267,36 @@ objc_library(
    "src/core/lib/iomgr/pollset.h",
    "src/core/lib/iomgr/pollset_set.h",
    "src/core/lib/iomgr/pollset_set_windows.h",
    "src/core/lib/iomgr/pollset_uv.h",
    "src/core/lib/iomgr/pollset_windows.h",
    "src/core/lib/iomgr/port.h",
    "src/core/lib/iomgr/resolve_address.h",
    "src/core/lib/iomgr/resource_quota.h",
    "src/core/lib/iomgr/sockaddr.h",
    "src/core/lib/iomgr/sockaddr_posix.h",
    "src/core/lib/iomgr/sockaddr_utils.h",
    "src/core/lib/iomgr/sockaddr_windows.h",
    "src/core/lib/iomgr/socket_utils.h",
    "src/core/lib/iomgr/socket_utils_posix.h",
    "src/core/lib/iomgr/socket_windows.h",
    "src/core/lib/iomgr/tcp_client.h",
    "src/core/lib/iomgr/tcp_client_posix.h",
    "src/core/lib/iomgr/tcp_posix.h",
    "src/core/lib/iomgr/tcp_server.h",
    "src/core/lib/iomgr/tcp_uv.h",
    "src/core/lib/iomgr/tcp_windows.h",
    "src/core/lib/iomgr/time_averaged_stats.h",
    "src/core/lib/iomgr/timer.h",
    "src/core/lib/iomgr/timer_generic.h",
    "src/core/lib/iomgr/timer_heap.h",
    "src/core/lib/iomgr/timer_uv.h",
    "src/core/lib/iomgr/udp_server.h",
    "src/core/lib/iomgr/unix_sockets_posix.h",
    "src/core/lib/iomgr/wakeup_fd_cv.h",
    "src/core/lib/iomgr/wakeup_fd_pipe.h",
    "src/core/lib/iomgr/wakeup_fd_posix.h",
    "src/core/lib/iomgr/workqueue.h",
    "src/core/lib/iomgr/workqueue_uv.h",
    "src/core/lib/iomgr/workqueue_windows.h",
    "src/core/lib/json/json.h",
    "src/core/lib/json/json_common.h",
@ -2281,6 +2318,7 @@ objc_library(
    "src/core/lib/transport/mdstr_hash_table.h",
    "src/core/lib/transport/metadata.h",
    "src/core/lib/transport/metadata_batch.h",
    "src/core/lib/transport/method_config.h",
    "src/core/lib/transport/static_metadata.h",
    "src/core/lib/transport/timeout_encoding.h",
    "src/core/lib/transport/transport.h",
@ -2338,12 +2376,10 @@ objc_library(
    "src/core/ext/client_channel/lb_policy.h",
    "src/core/ext/client_channel/lb_policy_factory.h",
    "src/core/ext/client_channel/lb_policy_registry.h",
    "src/core/ext/client_channel/method_config.h",
    "src/core/ext/client_channel/parse_address.h",
    "src/core/ext/client_channel/resolver.h",
    "src/core/ext/client_channel/resolver_factory.h",
    "src/core/ext/client_channel/resolver_registry.h",
    "src/core/ext/client_channel/resolver_result.h",
    "src/core/ext/client_channel/subchannel.h",
    "src/core/ext/client_channel/subchannel_index.h",
    "src/core/ext/client_channel/uri_parser.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -310,6 +310,7 @@ add_library(grpc
  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_uv.c
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
@ -321,28 +322,39 @@ add_library(grpc
  src/core/lib/iomgr/iocp_windows.c
  src/core/lib/iomgr/iomgr.c
  src/core/lib/iomgr/iomgr_posix.c
  src/core/lib/iomgr/iomgr_uv.c
  src/core/lib/iomgr/iomgr_windows.c
  src/core/lib/iomgr/load_file.c
  src/core/lib/iomgr/network_status_tracker.c
  src/core/lib/iomgr/polling_entity.c
  src/core/lib/iomgr/pollset_set_uv.c
  src/core/lib/iomgr/pollset_set_windows.c
  src/core/lib/iomgr/pollset_uv.c
  src/core/lib/iomgr/pollset_windows.c
  src/core/lib/iomgr/resolve_address_posix.c
  src/core/lib/iomgr/resolve_address_uv.c
  src/core/lib/iomgr/resolve_address_windows.c
  src/core/lib/iomgr/resource_quota.c
  src/core/lib/iomgr/sockaddr_utils.c
  src/core/lib/iomgr/socket_utils_common_posix.c
  src/core/lib/iomgr/socket_utils_linux.c
  src/core/lib/iomgr/socket_utils_posix.c
  src/core/lib/iomgr/socket_utils_uv.c
  src/core/lib/iomgr/socket_utils_windows.c
  src/core/lib/iomgr/socket_windows.c
  src/core/lib/iomgr/tcp_client_posix.c
  src/core/lib/iomgr/tcp_client_uv.c
  src/core/lib/iomgr/tcp_client_windows.c
  src/core/lib/iomgr/tcp_posix.c
  src/core/lib/iomgr/tcp_server_posix.c
  src/core/lib/iomgr/tcp_server_uv.c
  src/core/lib/iomgr/tcp_server_windows.c
  src/core/lib/iomgr/tcp_uv.c
  src/core/lib/iomgr/tcp_windows.c
  src/core/lib/iomgr/time_averaged_stats.c
-  src/core/lib/iomgr/timer.c
+  src/core/lib/iomgr/timer_generic.c
  src/core/lib/iomgr/timer_heap.c
  src/core/lib/iomgr/timer_uv.c
  src/core/lib/iomgr/udp_server.c
  src/core/lib/iomgr/unix_sockets_posix.c
  src/core/lib/iomgr/unix_sockets_posix_noop.c
@ -351,6 +363,7 @@ add_library(grpc
  src/core/lib/iomgr/wakeup_fd_nospecial.c
  src/core/lib/iomgr/wakeup_fd_pipe.c
  src/core/lib/iomgr/wakeup_fd_posix.c
  src/core/lib/iomgr/workqueue_uv.c
  src/core/lib/iomgr/workqueue_windows.c
  src/core/lib/json/json.c
  src/core/lib/json/json_reader.c
@ -379,6 +392,7 @@ add_library(grpc
  src/core/lib/transport/mdstr_hash_table.c
  src/core/lib/transport/metadata.c
  src/core/lib/transport/metadata_batch.c
  src/core/lib/transport/method_config.c
  src/core/lib/transport/static_metadata.c
  src/core/lib/transport/timeout_encoding.c
  src/core/lib/transport/transport.c
@ -412,8 +426,7 @@ add_library(grpc
  src/core/lib/security/credentials/credentials.c
  src/core/lib/security/credentials/credentials_metadata.c
  src/core/lib/security/credentials/fake/fake_credentials.c
-  src/core/lib/security/credentials/google_default/credentials_posix.c
+  src/core/lib/security/credentials/google_default/credentials_generic.c
  src/core/lib/security/credentials/google_default/credentials_windows.c
  src/core/lib/security/credentials/google_default/google_default_credentials.c
  src/core/lib/security/credentials/iam/iam_credentials.c
  src/core/lib/security/credentials/jwt/json_token.c
@ -446,12 +459,10 @@ add_library(grpc
  src/core/ext/client_channel/lb_policy.c
  src/core/ext/client_channel/lb_policy_factory.c
  src/core/ext/client_channel/lb_policy_registry.c
  src/core/ext/client_channel/method_config.c
  src/core/ext/client_channel/parse_address.c
  src/core/ext/client_channel/resolver.c
  src/core/ext/client_channel/resolver_factory.c
  src/core/ext/client_channel/resolver_registry.c
  src/core/ext/client_channel/resolver_result.c
  src/core/ext/client_channel/subchannel.c
  src/core/ext/client_channel/subchannel_index.c
  src/core/ext/client_channel/uri_parser.c
@ -571,6 +582,7 @@ add_library(grpc_cronet
  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_uv.c
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
@ -582,28 +594,39 @@ add_library(grpc_cronet
  src/core/lib/iomgr/iocp_windows.c
  src/core/lib/iomgr/iomgr.c
  src/core/lib/iomgr/iomgr_posix.c
  src/core/lib/iomgr/iomgr_uv.c
  src/core/lib/iomgr/iomgr_windows.c
  src/core/lib/iomgr/load_file.c
  src/core/lib/iomgr/network_status_tracker.c
  src/core/lib/iomgr/polling_entity.c
  src/core/lib/iomgr/pollset_set_uv.c
  src/core/lib/iomgr/pollset_set_windows.c
  src/core/lib/iomgr/pollset_uv.c
  src/core/lib/iomgr/pollset_windows.c
  src/core/lib/iomgr/resolve_address_posix.c
  src/core/lib/iomgr/resolve_address_uv.c
  src/core/lib/iomgr/resolve_address_windows.c
  src/core/lib/iomgr/resource_quota.c
  src/core/lib/iomgr/sockaddr_utils.c
  src/core/lib/iomgr/socket_utils_common_posix.c
  src/core/lib/iomgr/socket_utils_linux.c
  src/core/lib/iomgr/socket_utils_posix.c
  src/core/lib/iomgr/socket_utils_uv.c
  src/core/lib/iomgr/socket_utils_windows.c
  src/core/lib/iomgr/socket_windows.c
  src/core/lib/iomgr/tcp_client_posix.c
  src/core/lib/iomgr/tcp_client_uv.c
  src/core/lib/iomgr/tcp_client_windows.c
  src/core/lib/iomgr/tcp_posix.c
  src/core/lib/iomgr/tcp_server_posix.c
  src/core/lib/iomgr/tcp_server_uv.c
  src/core/lib/iomgr/tcp_server_windows.c
  src/core/lib/iomgr/tcp_uv.c
  src/core/lib/iomgr/tcp_windows.c
  src/core/lib/iomgr/time_averaged_stats.c
-  src/core/lib/iomgr/timer.c
+  src/core/lib/iomgr/timer_generic.c
  src/core/lib/iomgr/timer_heap.c
  src/core/lib/iomgr/timer_uv.c
  src/core/lib/iomgr/udp_server.c
  src/core/lib/iomgr/unix_sockets_posix.c
  src/core/lib/iomgr/unix_sockets_posix_noop.c
@ -612,6 +635,7 @@ add_library(grpc_cronet
  src/core/lib/iomgr/wakeup_fd_nospecial.c
  src/core/lib/iomgr/wakeup_fd_pipe.c
  src/core/lib/iomgr/wakeup_fd_posix.c
  src/core/lib/iomgr/workqueue_uv.c
  src/core/lib/iomgr/workqueue_windows.c
  src/core/lib/json/json.c
  src/core/lib/json/json_reader.c
@ -640,6 +664,7 @@ add_library(grpc_cronet
  src/core/lib/transport/mdstr_hash_table.c
  src/core/lib/transport/metadata.c
  src/core/lib/transport/metadata_batch.c
  src/core/lib/transport/method_config.c
  src/core/lib/transport/static_metadata.c
  src/core/lib/transport/timeout_encoding.c
  src/core/lib/transport/transport.c
@ -681,12 +706,10 @@ add_library(grpc_cronet
  src/core/ext/client_channel/lb_policy.c
  src/core/ext/client_channel/lb_policy_factory.c
  src/core/ext/client_channel/lb_policy_registry.c
  src/core/ext/client_channel/method_config.c
  src/core/ext/client_channel/parse_address.c
  src/core/ext/client_channel/resolver.c
  src/core/ext/client_channel/resolver_factory.c
  src/core/ext/client_channel/resolver_registry.c
  src/core/ext/client_channel/resolver_result.c
  src/core/ext/client_channel/subchannel.c
  src/core/ext/client_channel/subchannel_index.c
  src/core/ext/client_channel/uri_parser.c
@ -696,8 +719,7 @@ add_library(grpc_cronet
  src/core/lib/security/credentials/credentials.c
  src/core/lib/security/credentials/credentials_metadata.c
  src/core/lib/security/credentials/fake/fake_credentials.c
-  src/core/lib/security/credentials/google_default/credentials_posix.c
+  src/core/lib/security/credentials/google_default/credentials_generic.c
  src/core/lib/security/credentials/google_default/credentials_windows.c
  src/core/lib/security/credentials/google_default/google_default_credentials.c
  src/core/lib/security/credentials/iam/iam_credentials.c
  src/core/lib/security/credentials/jwt/json_token.c
@ -804,6 +826,7 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/combiner.c
  src/core/lib/iomgr/endpoint.c
  src/core/lib/iomgr/endpoint_pair_posix.c
  src/core/lib/iomgr/endpoint_pair_uv.c
  src/core/lib/iomgr/endpoint_pair_windows.c
  src/core/lib/iomgr/error.c
  src/core/lib/iomgr/ev_epoll_linux.c
@ -815,28 +838,39 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/iocp_windows.c
  src/core/lib/iomgr/iomgr.c
  src/core/lib/iomgr/iomgr_posix.c
  src/core/lib/iomgr/iomgr_uv.c
  src/core/lib/iomgr/iomgr_windows.c
  src/core/lib/iomgr/load_file.c
  src/core/lib/iomgr/network_status_tracker.c
  src/core/lib/iomgr/polling_entity.c
  src/core/lib/iomgr/pollset_set_uv.c
  src/core/lib/iomgr/pollset_set_windows.c
  src/core/lib/iomgr/pollset_uv.c
  src/core/lib/iomgr/pollset_windows.c
  src/core/lib/iomgr/resolve_address_posix.c
  src/core/lib/iomgr/resolve_address_uv.c
  src/core/lib/iomgr/resolve_address_windows.c
  src/core/lib/iomgr/resource_quota.c
  src/core/lib/iomgr/sockaddr_utils.c
  src/core/lib/iomgr/socket_utils_common_posix.c
  src/core/lib/iomgr/socket_utils_linux.c
  src/core/lib/iomgr/socket_utils_posix.c
  src/core/lib/iomgr/socket_utils_uv.c
  src/core/lib/iomgr/socket_utils_windows.c
  src/core/lib/iomgr/socket_windows.c
  src/core/lib/iomgr/tcp_client_posix.c
  src/core/lib/iomgr/tcp_client_uv.c
  src/core/lib/iomgr/tcp_client_windows.c
  src/core/lib/iomgr/tcp_posix.c
  src/core/lib/iomgr/tcp_server_posix.c
  src/core/lib/iomgr/tcp_server_uv.c
  src/core/lib/iomgr/tcp_server_windows.c
  src/core/lib/iomgr/tcp_uv.c
  src/core/lib/iomgr/tcp_windows.c
  src/core/lib/iomgr/time_averaged_stats.c
-  src/core/lib/iomgr/timer.c
+  src/core/lib/iomgr/timer_generic.c
  src/core/lib/iomgr/timer_heap.c
  src/core/lib/iomgr/timer_uv.c
  src/core/lib/iomgr/udp_server.c
  src/core/lib/iomgr/unix_sockets_posix.c
  src/core/lib/iomgr/unix_sockets_posix_noop.c
@ -845,6 +879,7 @@ add_library(grpc_unsecure
  src/core/lib/iomgr/wakeup_fd_nospecial.c
  src/core/lib/iomgr/wakeup_fd_pipe.c
  src/core/lib/iomgr/wakeup_fd_posix.c
  src/core/lib/iomgr/workqueue_uv.c
  src/core/lib/iomgr/workqueue_windows.c
  src/core/lib/json/json.c
  src/core/lib/json/json_reader.c
@ -873,6 +908,7 @@ add_library(grpc_unsecure
  src/core/lib/transport/mdstr_hash_table.c
  src/core/lib/transport/metadata.c
  src/core/lib/transport/metadata_batch.c
  src/core/lib/transport/method_config.c
  src/core/lib/transport/static_metadata.c
  src/core/lib/transport/timeout_encoding.c
  src/core/lib/transport/transport.c
@ -914,12 +950,10 @@ add_library(grpc_unsecure
  src/core/ext/client_channel/lb_policy.c
  src/core/ext/client_channel/lb_policy_factory.c
  src/core/ext/client_channel/lb_policy_registry.c
  src/core/ext/client_channel/method_config.c
  src/core/ext/client_channel/parse_address.c
  src/core/ext/client_channel/resolver.c
  src/core/ext/client_channel/resolver_factory.c
  src/core/ext/client_channel/resolver_registry.c
  src/core/ext/client_channel/resolver_result.c
  src/core/ext/client_channel/subchannel.c
  src/core/ext/client_channel/subchannel_index.c
  src/core/ext/client_channel/uri_parser.c
@ -1030,6 +1064,7 @@ add_library(grpc++
  src/cpp/common/channel_filter.cc
  src/cpp/common/completion_queue_cc.cc
  src/cpp/common/core_codegen.cc
  src/cpp/common/resource_quota_cc.cc
  src/cpp/common/rpc_method.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
@ -1039,6 +1074,7 @@ add_library(grpc++
  src/cpp/server/server_context.cc
  src/cpp/server/server_credentials.cc
  src/cpp/server/server_posix.cc
  src/cpp/thread_manager/thread_manager.cc
  src/cpp/util/byte_buffer_cc.cc
  src/cpp/util/slice_cc.cc
  src/cpp/util/status.cc
@ -1091,6 +1127,7 @@ foreach(_hdr
  include/grpc++/impl/thd.h
  include/grpc++/impl/thd_cxx11.h
  include/grpc++/impl/thd_no_cxx11.h
  include/grpc++/resource_quota.h
  include/grpc++/security/auth_context.h
  include/grpc++/security/auth_metadata_processor.h
  include/grpc++/security/credentials.h
@ -1193,6 +1230,7 @@ add_library(grpc++_cronet
  src/cpp/common/channel_filter.cc
  src/cpp/common/completion_queue_cc.cc
  src/cpp/common/core_codegen.cc
  src/cpp/common/resource_quota_cc.cc
  src/cpp/common/rpc_method.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
@ -1202,6 +1240,7 @@ add_library(grpc++_cronet
  src/cpp/server/server_context.cc
  src/cpp/server/server_credentials.cc
  src/cpp/server/server_posix.cc
  src/cpp/thread_manager/thread_manager.cc
  src/cpp/util/byte_buffer_cc.cc
  src/cpp/util/slice_cc.cc
  src/cpp/util/status.cc
@ -1254,6 +1293,7 @@ foreach(_hdr
  include/grpc++/impl/thd.h
  include/grpc++/impl/thd_cxx11.h
  include/grpc++/impl/thd_no_cxx11.h
  include/grpc++/resource_quota.h
  include/grpc++/security/auth_context.h
  include/grpc++/security/auth_metadata_processor.h
  include/grpc++/security/credentials.h
@ -1343,8 +1383,7 @@ endif()
 add_library(grpc++_reflection
  src/cpp/ext/proto_server_reflection.cc
  src/cpp/ext/proto_server_reflection_plugin.cc
-  src/cpp/ext/reflection.grpc.pb.cc
+  src/proto/grpc/reflection/v1alpha/reflection.proto
  src/cpp/ext/reflection.pb.cc
 )
 target_include_directories(grpc++_reflection
@ -1362,58 +1401,6 @@ target_link_libraries(grpc++_reflection
 foreach(_hdr
  include/grpc++/ext/proto_server_reflection_plugin.h
  include/grpc++/ext/reflection.grpc.pb.h
  include/grpc++/ext/reflection.pb.h
  include/grpc++/impl/codegen/proto_utils.h
  include/grpc++/impl/codegen/async_stream.h
  include/grpc++/impl/codegen/async_unary_call.h
  include/grpc++/impl/codegen/call.h
  include/grpc++/impl/codegen/call_hook.h
  include/grpc++/impl/codegen/channel_interface.h
  include/grpc++/impl/codegen/client_context.h
  include/grpc++/impl/codegen/client_unary_call.h
  include/grpc++/impl/codegen/completion_queue.h
  include/grpc++/impl/codegen/completion_queue_tag.h
  include/grpc++/impl/codegen/config.h
  include/grpc++/impl/codegen/core_codegen_interface.h
  include/grpc++/impl/codegen/create_auth_context.h
  include/grpc++/impl/codegen/grpc_library.h
  include/grpc++/impl/codegen/method_handler_impl.h
  include/grpc++/impl/codegen/rpc_method.h
  include/grpc++/impl/codegen/rpc_service_method.h
  include/grpc++/impl/codegen/security/auth_context.h
  include/grpc++/impl/codegen/serialization_traits.h
  include/grpc++/impl/codegen/server_context.h
  include/grpc++/impl/codegen/server_interface.h
  include/grpc++/impl/codegen/service_type.h
  include/grpc++/impl/codegen/status.h
  include/grpc++/impl/codegen/status_code_enum.h
  include/grpc++/impl/codegen/status_helper.h
  include/grpc++/impl/codegen/string_ref.h
  include/grpc++/impl/codegen/stub_options.h
  include/grpc++/impl/codegen/sync.h
  include/grpc++/impl/codegen/sync_cxx11.h
  include/grpc++/impl/codegen/sync_no_cxx11.h
  include/grpc++/impl/codegen/sync_stream.h
  include/grpc++/impl/codegen/time.h
  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/grpc_types.h
  include/grpc/impl/codegen/propagation_bits.h
  include/grpc/impl/codegen/status.h
  include/grpc/impl/codegen/atm.h
  include/grpc/impl/codegen/atm_gcc_atomic.h
  include/grpc/impl/codegen/atm_gcc_sync.h
  include/grpc/impl/codegen/atm_windows.h
  include/grpc/impl/codegen/gpr_types.h
  include/grpc/impl/codegen/port_platform.h
  include/grpc/impl/codegen/slice.h
  include/grpc/impl/codegen/sync.h
  include/grpc/impl/codegen/sync_generic.h
  include/grpc/impl/codegen/sync_posix.h
  include/grpc/impl/codegen/sync_windows.h
  include/grpc++/impl/codegen/config_protobuf.h
 )
  string(REPLACE "include/" "" _path ${_hdr})
  get_filename_component(_path ${_path} PATH)
@ -1447,6 +1434,7 @@ add_library(grpc++_unsecure
  src/cpp/common/channel_filter.cc
  src/cpp/common/completion_queue_cc.cc
  src/cpp/common/core_codegen.cc
  src/cpp/common/resource_quota_cc.cc
  src/cpp/common/rpc_method.cc
  src/cpp/server/async_generic_service.cc
  src/cpp/server/create_default_thread_pool.cc
@ -1456,6 +1444,7 @@ add_library(grpc++_unsecure
  src/cpp/server/server_context.cc
  src/cpp/server/server_credentials.cc
  src/cpp/server/server_posix.cc
  src/cpp/thread_manager/thread_manager.cc
  src/cpp/util/byte_buffer_cc.cc
  src/cpp/util/slice_cc.cc
  src/cpp/util/status.cc
@ -1508,6 +1497,7 @@ foreach(_hdr
  include/grpc++/impl/thd.h
  include/grpc++/impl/thd_cxx11.h
  include/grpc++/impl/thd_no_cxx11.h
  include/grpc++/resource_quota.h
  include/grpc++/security/auth_context.h
  include/grpc++/security/auth_metadata_processor.h
  include/grpc++/security/credentials.h
--- a/441
+++ b/441
--- a/binding.gyp
+++ b/binding.gyp
@ -42,6 +42,9 @@
      '.',
      'include'
    ],
    'defines': [
      'GRPC_UV'
    ],
    'conditions': [
      ['OS == "win"', {
        "include_dirs": [
@ -585,6 +588,7 @@
        'src/core/lib/iomgr/combiner.c',
        'src/core/lib/iomgr/endpoint.c',
        'src/core/lib/iomgr/endpoint_pair_posix.c',
        'src/core/lib/iomgr/endpoint_pair_uv.c',
        'src/core/lib/iomgr/endpoint_pair_windows.c',
        'src/core/lib/iomgr/error.c',
        'src/core/lib/iomgr/ev_epoll_linux.c',
@ -596,28 +600,39 @@
        'src/core/lib/iomgr/iocp_windows.c',
        'src/core/lib/iomgr/iomgr.c',
        'src/core/lib/iomgr/iomgr_posix.c',
        'src/core/lib/iomgr/iomgr_uv.c',
        'src/core/lib/iomgr/iomgr_windows.c',
        'src/core/lib/iomgr/load_file.c',
        'src/core/lib/iomgr/network_status_tracker.c',
        'src/core/lib/iomgr/polling_entity.c',
        'src/core/lib/iomgr/pollset_set_uv.c',
        'src/core/lib/iomgr/pollset_set_windows.c',
        'src/core/lib/iomgr/pollset_uv.c',
        'src/core/lib/iomgr/pollset_windows.c',
        'src/core/lib/iomgr/resolve_address_posix.c',
        'src/core/lib/iomgr/resolve_address_uv.c',
        'src/core/lib/iomgr/resolve_address_windows.c',
        'src/core/lib/iomgr/resource_quota.c',
        'src/core/lib/iomgr/sockaddr_utils.c',
        'src/core/lib/iomgr/socket_utils_common_posix.c',
        'src/core/lib/iomgr/socket_utils_linux.c',
        'src/core/lib/iomgr/socket_utils_posix.c',
        'src/core/lib/iomgr/socket_utils_uv.c',
        'src/core/lib/iomgr/socket_utils_windows.c',
        'src/core/lib/iomgr/socket_windows.c',
        'src/core/lib/iomgr/tcp_client_posix.c',
        'src/core/lib/iomgr/tcp_client_uv.c',
        'src/core/lib/iomgr/tcp_client_windows.c',
        'src/core/lib/iomgr/tcp_posix.c',
        'src/core/lib/iomgr/tcp_server_posix.c',
        'src/core/lib/iomgr/tcp_server_uv.c',
        'src/core/lib/iomgr/tcp_server_windows.c',
        'src/core/lib/iomgr/tcp_uv.c',
        'src/core/lib/iomgr/tcp_windows.c',
        'src/core/lib/iomgr/time_averaged_stats.c',
-        'src/core/lib/iomgr/timer.c',
+        'src/core/lib/iomgr/timer_generic.c',
        'src/core/lib/iomgr/timer_heap.c',
        'src/core/lib/iomgr/timer_uv.c',
        'src/core/lib/iomgr/udp_server.c',
        'src/core/lib/iomgr/unix_sockets_posix.c',
        'src/core/lib/iomgr/unix_sockets_posix_noop.c',
@ -626,6 +641,7 @@
        'src/core/lib/iomgr/wakeup_fd_nospecial.c',
        'src/core/lib/iomgr/wakeup_fd_pipe.c',
        'src/core/lib/iomgr/wakeup_fd_posix.c',
        'src/core/lib/iomgr/workqueue_uv.c',
        'src/core/lib/iomgr/workqueue_windows.c',
        'src/core/lib/json/json.c',
        'src/core/lib/json/json_reader.c',
@ -654,6 +670,7 @@
        'src/core/lib/transport/mdstr_hash_table.c',
        'src/core/lib/transport/metadata.c',
        'src/core/lib/transport/metadata_batch.c',
        'src/core/lib/transport/method_config.c',
        'src/core/lib/transport/static_metadata.c',
        'src/core/lib/transport/timeout_encoding.c',
        'src/core/lib/transport/transport.c',
@ -687,8 +704,7 @@
        'src/core/lib/security/credentials/credentials.c',
        'src/core/lib/security/credentials/credentials_metadata.c',
        'src/core/lib/security/credentials/fake/fake_credentials.c',
-        'src/core/lib/security/credentials/google_default/credentials_posix.c',
+        'src/core/lib/security/credentials/google_default/credentials_generic.c',
        'src/core/lib/security/credentials/google_default/credentials_windows.c',
        'src/core/lib/security/credentials/google_default/google_default_credentials.c',
        'src/core/lib/security/credentials/iam/iam_credentials.c',
        'src/core/lib/security/credentials/jwt/json_token.c',
@ -721,12 +737,10 @@
        'src/core/ext/client_channel/lb_policy.c',
        'src/core/ext/client_channel/lb_policy_factory.c',
        'src/core/ext/client_channel/lb_policy_registry.c',
        'src/core/ext/client_channel/method_config.c',
        'src/core/ext/client_channel/parse_address.c',
        'src/core/ext/client_channel/resolver.c',
        'src/core/ext/client_channel/resolver_factory.c',
        'src/core/ext/client_channel/resolver_registry.c',
        'src/core/ext/client_channel/resolver_result.c',
        'src/core/ext/client_channel/subchannel.c',
        'src/core/ext/client_channel/subchannel_index.c',
        'src/core/ext/client_channel/uri_parser.c',
@ -815,6 +829,7 @@
        "src/node/ext/call_credentials.cc",
        "src/node/ext/channel.cc",
        "src/node/ext/channel_credentials.cc",
        "src/node/ext/completion_queue.cc",
        "src/node/ext/completion_queue_async_worker.cc",
        "src/node/ext/node_grpc.cc",
        "src/node/ext/server.cc",
--- a/build.yaml
+++ b/build.yaml
@ -204,27 +204,36 @@ filegroups:
  - src/core/lib/iomgr/pollset.h
  - src/core/lib/iomgr/pollset_set.h
  - src/core/lib/iomgr/pollset_set_windows.h
  - src/core/lib/iomgr/pollset_uv.h
  - src/core/lib/iomgr/pollset_windows.h
  - src/core/lib/iomgr/port.h
  - src/core/lib/iomgr/resolve_address.h
  - src/core/lib/iomgr/resource_quota.h
  - src/core/lib/iomgr/sockaddr.h
  - src/core/lib/iomgr/sockaddr_posix.h
  - src/core/lib/iomgr/sockaddr_utils.h
  - src/core/lib/iomgr/sockaddr_windows.h
  - src/core/lib/iomgr/socket_utils.h
  - src/core/lib/iomgr/socket_utils_posix.h
  - src/core/lib/iomgr/socket_windows.h
  - src/core/lib/iomgr/tcp_client.h
  - src/core/lib/iomgr/tcp_client_posix.h
  - src/core/lib/iomgr/tcp_posix.h
  - src/core/lib/iomgr/tcp_server.h
  - src/core/lib/iomgr/tcp_uv.h
  - src/core/lib/iomgr/tcp_windows.h
  - src/core/lib/iomgr/time_averaged_stats.h
  - src/core/lib/iomgr/timer.h
  - src/core/lib/iomgr/timer_generic.h
  - src/core/lib/iomgr/timer_heap.h
  - src/core/lib/iomgr/timer_uv.h
  - src/core/lib/iomgr/udp_server.h
  - src/core/lib/iomgr/unix_sockets_posix.h
  - src/core/lib/iomgr/wakeup_fd_cv.h
  - src/core/lib/iomgr/wakeup_fd_pipe.h
  - src/core/lib/iomgr/wakeup_fd_posix.h
  - src/core/lib/iomgr/workqueue.h
  - src/core/lib/iomgr/workqueue_uv.h
  - src/core/lib/iomgr/workqueue_windows.h
  - src/core/lib/json/json.h
  - src/core/lib/json/json_common.h
@ -246,6 +255,7 @@ filegroups:
  - src/core/lib/transport/mdstr_hash_table.h
  - src/core/lib/transport/metadata.h
  - src/core/lib/transport/metadata_batch.h
  - src/core/lib/transport/method_config.h
  - src/core/lib/transport/static_metadata.h
  - src/core/lib/transport/timeout_encoding.h
  - src/core/lib/transport/transport.h
@ -271,6 +281,7 @@ filegroups:
  - src/core/lib/iomgr/combiner.c
  - src/core/lib/iomgr/endpoint.c
  - src/core/lib/iomgr/endpoint_pair_posix.c
  - src/core/lib/iomgr/endpoint_pair_uv.c
  - src/core/lib/iomgr/endpoint_pair_windows.c
  - src/core/lib/iomgr/error.c
  - src/core/lib/iomgr/ev_epoll_linux.c
@ -282,28 +293,39 @@ filegroups:
  - src/core/lib/iomgr/iocp_windows.c
  - src/core/lib/iomgr/iomgr.c
  - src/core/lib/iomgr/iomgr_posix.c
  - src/core/lib/iomgr/iomgr_uv.c
  - src/core/lib/iomgr/iomgr_windows.c
  - src/core/lib/iomgr/load_file.c
  - src/core/lib/iomgr/network_status_tracker.c
  - src/core/lib/iomgr/polling_entity.c
  - src/core/lib/iomgr/pollset_set_uv.c
  - src/core/lib/iomgr/pollset_set_windows.c
  - src/core/lib/iomgr/pollset_uv.c
  - src/core/lib/iomgr/pollset_windows.c
  - src/core/lib/iomgr/resolve_address_posix.c
  - src/core/lib/iomgr/resolve_address_uv.c
  - src/core/lib/iomgr/resolve_address_windows.c
  - src/core/lib/iomgr/resource_quota.c
  - src/core/lib/iomgr/sockaddr_utils.c
  - src/core/lib/iomgr/socket_utils_common_posix.c
  - src/core/lib/iomgr/socket_utils_linux.c
  - src/core/lib/iomgr/socket_utils_posix.c
  - src/core/lib/iomgr/socket_utils_uv.c
  - src/core/lib/iomgr/socket_utils_windows.c
  - src/core/lib/iomgr/socket_windows.c
  - src/core/lib/iomgr/tcp_client_posix.c
  - src/core/lib/iomgr/tcp_client_uv.c
  - src/core/lib/iomgr/tcp_client_windows.c
  - src/core/lib/iomgr/tcp_posix.c
  - src/core/lib/iomgr/tcp_server_posix.c
  - src/core/lib/iomgr/tcp_server_uv.c
  - src/core/lib/iomgr/tcp_server_windows.c
  - src/core/lib/iomgr/tcp_uv.c
  - src/core/lib/iomgr/tcp_windows.c
  - src/core/lib/iomgr/time_averaged_stats.c
-  - src/core/lib/iomgr/timer.c
+  - src/core/lib/iomgr/timer_generic.c
  - src/core/lib/iomgr/timer_heap.c
  - src/core/lib/iomgr/timer_uv.c
  - src/core/lib/iomgr/udp_server.c
  - src/core/lib/iomgr/unix_sockets_posix.c
  - src/core/lib/iomgr/unix_sockets_posix_noop.c
@ -312,6 +334,7 @@ filegroups:
  - src/core/lib/iomgr/wakeup_fd_nospecial.c
  - src/core/lib/iomgr/wakeup_fd_pipe.c
  - src/core/lib/iomgr/wakeup_fd_posix.c
  - src/core/lib/iomgr/workqueue_uv.c
  - src/core/lib/iomgr/workqueue_windows.c
  - src/core/lib/json/json.c
  - src/core/lib/json/json_reader.c
@ -340,6 +363,7 @@ filegroups:
  - src/core/lib/transport/mdstr_hash_table.c
  - src/core/lib/transport/metadata.c
  - src/core/lib/transport/metadata_batch.c
  - src/core/lib/transport/method_config.c
  - src/core/lib/transport/static_metadata.c
  - src/core/lib/transport/timeout_encoding.c
  - src/core/lib/transport/transport.c
@ -358,12 +382,10 @@ filegroups:
  - src/core/ext/client_channel/lb_policy.h
  - src/core/ext/client_channel/lb_policy_factory.h
  - src/core/ext/client_channel/lb_policy_registry.h
  - src/core/ext/client_channel/method_config.h
  - src/core/ext/client_channel/parse_address.h
  - src/core/ext/client_channel/resolver.h
  - src/core/ext/client_channel/resolver_factory.h
  - src/core/ext/client_channel/resolver_registry.h
  - src/core/ext/client_channel/resolver_result.h
  - src/core/ext/client_channel/subchannel.h
  - src/core/ext/client_channel/subchannel_index.h
  - src/core/ext/client_channel/uri_parser.h
@ -379,12 +401,10 @@ filegroups:
  - src/core/ext/client_channel/lb_policy.c
  - src/core/ext/client_channel/lb_policy_factory.c
  - src/core/ext/client_channel/lb_policy_registry.c
  - src/core/ext/client_channel/method_config.c
  - src/core/ext/client_channel/parse_address.c
  - src/core/ext/client_channel/resolver.c
  - src/core/ext/client_channel/resolver_factory.c
  - src/core/ext/client_channel/resolver_registry.c
  - src/core/ext/client_channel/resolver_result.c
  - src/core/ext/client_channel/subchannel.c
  - src/core/ext/client_channel/subchannel_index.c
  - src/core/ext/client_channel/uri_parser.c
@ -483,8 +503,7 @@ filegroups:
  - src/core/lib/security/credentials/credentials.c
  - src/core/lib/security/credentials/credentials_metadata.c
  - src/core/lib/security/credentials/fake/fake_credentials.c
-  - src/core/lib/security/credentials/google_default/credentials_posix.c
+  - src/core/lib/security/credentials/google_default/credentials_generic.c
  - src/core/lib/security/credentials/google_default/credentials_windows.c
  - src/core/lib/security/credentials/google_default/google_default_credentials.c
  - src/core/lib/security/credentials/iam/iam_credentials.c
  - src/core/lib/security/credentials/jwt/json_token.c
@ -536,6 +555,7 @@ filegroups:
  - test/core/util/passthru_endpoint.c
  - test/core/util/port_posix.c
  - test/core/util/port_server_client.c
  - test/core/util/port_uv.c
  - test/core/util/port_windows.c
  - test/core/util/slice_splitter.c
  deps:
@ -664,6 +684,8 @@ filegroups:
  deps:
  - gpr
  secure: true
  uses:
  - grpc_base
 - name: grpc++_base
  language: c++
  public_headers:
@ -694,6 +716,7 @@ filegroups:
  - include/grpc++/impl/thd.h
  - include/grpc++/impl/thd_cxx11.h
  - include/grpc++/impl/thd_no_cxx11.h
  - include/grpc++/resource_quota.h
  - include/grpc++/security/auth_context.h
  - include/grpc++/security/auth_metadata_processor.h
  - include/grpc++/security/credentials.h
@ -719,6 +742,7 @@ filegroups:
  - src/cpp/common/channel_filter.h
  - src/cpp/server/dynamic_thread_pool.h
  - src/cpp/server/thread_pool_interface.h
  - src/cpp/thread_manager/thread_manager.h
  src:
  - src/cpp/client/channel_cc.cc
  - src/cpp/client/client_context.cc
@ -731,6 +755,7 @@ filegroups:
  - src/cpp/common/channel_filter.cc
  - src/cpp/common/completion_queue_cc.cc
  - src/cpp/common/core_codegen.cc
  - src/cpp/common/resource_quota_cc.cc
  - src/cpp/common/rpc_method.cc
  - src/cpp/server/async_generic_service.cc
  - src/cpp/server/create_default_thread_pool.cc
@ -740,6 +765,7 @@ filegroups:
  - src/cpp/server/server_context.cc
  - src/cpp/server/server_credentials.cc
  - src/cpp/server/server_posix.cc
  - src/cpp/thread_manager/thread_manager.cc
  - src/cpp/util/byte_buffer_cc.cc
  - src/cpp/util/slice_cc.cc
  - src/cpp/util/status.cc
@ -802,14 +828,8 @@ filegroups:
  - include/grpc++/impl/codegen/config_protobuf.h
 - name: grpc++_reflection_proto
  language: c++
  public_headers:
  - include/grpc++/ext/reflection.grpc.pb.h
  - include/grpc++/ext/reflection.pb.h
  src:
-  - src/cpp/ext/reflection.grpc.pb.cc
+  - src/proto/grpc/reflection/v1alpha/reflection.proto
  - src/cpp/ext/reflection.pb.cc
  uses:
  - grpc++_codegen_proto
 - name: thrift_util
  language: c++
  public_headers:
@ -1027,6 +1047,18 @@ libs:
  platforms:
  - linux
  secure: true
 - name: grpc++_proto_reflection_desc_db
  build: private
  language: c++
  headers:
  - test/cpp/util/proto_reflection_descriptor_database.h
  src:
  - test/cpp/util/proto_reflection_descriptor_database.cc
  deps:
  - grpc++
  filegroups:
  - grpc++_reflection_proto
  - grpc++_config_proto
 - name: grpc++_reflection
  build: all
  language: c++
@ -1041,11 +1073,6 @@ libs:
  - grpc++
  filegroups:
  - grpc++_reflection_proto
 - name: grpc++_reflection_codegen
  build: private
  language: c++
  src:
  - src/proto/grpc/reflection/v1alpha/reflection.proto
 - name: grpc++_test
  build: private
  language: c++
@ -1118,18 +1145,19 @@ libs:
  - test/cpp/util/config_grpc_cli.h
  - test/cpp/util/grpc_tool.h
  - test/cpp/util/proto_file_parser.h
  - test/cpp/util/proto_reflection_descriptor_database.h
  - test/cpp/util/service_describer.h
  src:
  - test/cpp/util/cli_call.cc
  - test/cpp/util/cli_credentials.cc
  - test/cpp/util/grpc_tool.cc
  - test/cpp/util/proto_file_parser.cc
  - test/cpp/util/proto_reflection_descriptor_database.cc
  - test/cpp/util/service_describer.cc
  deps:
-  - grpc++_reflection
+  - grpc++_proto_reflection_desc_db
  - grpc++
  filegroups:
  - grpc++_reflection_proto
  - grpc++_config_proto
 - name: grpc_plugin_support
  build: protoc
  language: c++
@ -1357,6 +1385,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: bin_decoder_test
  build: test
  language: c
@ -1498,6 +1528,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: connection_refused_test
  cpu_cost: 0.1
  build: test
@ -1520,6 +1552,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: dns_resolver_test
  build: test
  language: c
@ -1541,6 +1575,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -1555,6 +1591,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: ev_epoll_linux_test
  build: test
  language: c
@ -1565,6 +1603,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - linux
 - name: fd_conservation_posix_test
@ -1577,6 +1617,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -1591,6 +1633,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -1678,6 +1722,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -1898,6 +1944,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: grpc_create_jwt
  build: tool
  language: c
@ -1988,6 +2036,32 @@ targets:
  deps:
  - grpc
  - gpr
 - name: handshake_client
  build: test
  language: c
  src:
  - test/core/handshake/client_ssl.c
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
  platforms:
  - linux
  secure: true
 - name: handshake_server
  build: test
  language: c
  src:
  - test/core/handshake/server_ssl.c
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
  platforms:
  - linux
  secure: true
 - name: hpack_parser_fuzzer_test
  build: fuzzer
  language: c
@ -2360,6 +2434,19 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: resource_quota_test
  cpu_cost: 30
  build: test
  language: c
  src:
  - test/core/iomgr/resource_quota_test.c
  deps:
  - grpc_test_util
  - grpc
  - gpr_test_util
  - gpr
 - name: secure_channel_create_test
  build: test
  language: c
@ -2380,6 +2467,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: sequential_connectivity_test
  build: test
  language: c
@ -2390,6 +2479,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: server_chttp2_test
  build: test
  language: c
@ -2436,6 +2527,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: sockaddr_resolver_test
  build: test
  language: c
@ -2466,6 +2559,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2481,6 +2576,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2496,6 +2593,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2510,6 +2609,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2544,6 +2645,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: timer_list_test
  build: test
  language: c
@ -2554,6 +2657,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
 - name: transport_connectivity_state_test
  build: test
  language: c
@ -2598,6 +2703,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2635,6 +2742,8 @@ targets:
  - grpc
  - gpr_test_util
  - gpr
  exclude_iomgrs:
  - uv
  platforms:
  - mac
  - linux
@ -2877,7 +2986,7 @@ targets:
  - test/cpp/util/grpc_cli.cc
  deps:
  - grpc_cli_libs
-  - grpc++_reflection
+  - grpc++_proto_reflection_desc_db
  - grpc++
  - grpc
  - gpr
@ -2954,16 +3063,15 @@ targets:
  gtest: true
  build: test
  language: c++
  headers:
  - test/cpp/util/string_ref_helper.h
  src:
  - src/proto/grpc/testing/echo.proto
  - src/proto/grpc/testing/echo_messages.proto
  - test/cpp/util/grpc_tool_test.cc
  - test/cpp/util/string_ref_helper.cc
  deps:
  - grpc_cli_libs
  - grpc++_proto_reflection_desc_db
  - grpc++_reflection
  - grpc++_test_util
  - grpc_test_util
  - grpc++
  - grpc
@ -2971,7 +3079,6 @@ targets:
  - gpr
  filegroups:
  - grpc++_codegen_proto
  - grpc++_config_proto
 - name: grpclb_api_test
  gtest: true
  build: test
@ -3118,12 +3225,10 @@ targets:
  gtest: true
  build: test
  language: c++
  headers:
  - test/cpp/util/proto_reflection_descriptor_database.h
  src:
  - test/cpp/end2end/proto_server_reflection_test.cc
  - test/cpp/util/proto_reflection_descriptor_database.cc
  deps:
  - grpc++_proto_reflection_desc_db
  - grpc++_reflection
  - grpc++_test_util
  - grpc_test_util
@ -3392,6 +3497,16 @@ targets:
  - gpr_test_util
  - gpr
  - grpc++_test_config
 - name: thread_manager_test
  build: test
  language: c++
  src:
  - test/cpp/thread_manager/thread_manager_test.cc
  deps:
  - grpc++
  - grpc
  - gpr
  - grpc++_test_config
 - name: thread_stress_test
  gtest: true
  cpu_cost: 100
@ -3603,6 +3718,7 @@ node_modules:
  - src/node/ext/call_credentials.h
  - src/node/ext/channel.h
  - src/node/ext/channel_credentials.h
  - src/node/ext/completion_queue.h
  - src/node/ext/completion_queue_async_worker.h
  - src/node/ext/server.h
  - src/node/ext/server_credentials.h
@ -3622,6 +3738,7 @@ node_modules:
  - src/node/ext/call_credentials.cc
  - src/node/ext/channel.cc
  - src/node/ext/channel_credentials.cc
  - src/node/ext/completion_queue.cc
  - src/node/ext/completion_queue_async_worker.cc
  - src/node/ext/node_grpc.cc
  - src/node/ext/server.cc
--- a/config.m4
+++ b/config.m4
@ -104,6 +104,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/combiner.c \
    src/core/lib/iomgr/endpoint.c \
    src/core/lib/iomgr/endpoint_pair_posix.c \
    src/core/lib/iomgr/endpoint_pair_uv.c \
    src/core/lib/iomgr/endpoint_pair_windows.c \
    src/core/lib/iomgr/error.c \
    src/core/lib/iomgr/ev_epoll_linux.c \
@ -115,28 +116,39 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/iocp_windows.c \
    src/core/lib/iomgr/iomgr.c \
    src/core/lib/iomgr/iomgr_posix.c \
    src/core/lib/iomgr/iomgr_uv.c \
    src/core/lib/iomgr/iomgr_windows.c \
    src/core/lib/iomgr/load_file.c \
    src/core/lib/iomgr/network_status_tracker.c \
    src/core/lib/iomgr/polling_entity.c \
    src/core/lib/iomgr/pollset_set_uv.c \
    src/core/lib/iomgr/pollset_set_windows.c \
    src/core/lib/iomgr/pollset_uv.c \
    src/core/lib/iomgr/pollset_windows.c \
    src/core/lib/iomgr/resolve_address_posix.c \
    src/core/lib/iomgr/resolve_address_uv.c \
    src/core/lib/iomgr/resolve_address_windows.c \
    src/core/lib/iomgr/resource_quota.c \
    src/core/lib/iomgr/sockaddr_utils.c \
    src/core/lib/iomgr/socket_utils_common_posix.c \
    src/core/lib/iomgr/socket_utils_linux.c \
    src/core/lib/iomgr/socket_utils_posix.c \
    src/core/lib/iomgr/socket_utils_uv.c \
    src/core/lib/iomgr/socket_utils_windows.c \
    src/core/lib/iomgr/socket_windows.c \
    src/core/lib/iomgr/tcp_client_posix.c \
    src/core/lib/iomgr/tcp_client_uv.c \
    src/core/lib/iomgr/tcp_client_windows.c \
    src/core/lib/iomgr/tcp_posix.c \
    src/core/lib/iomgr/tcp_server_posix.c \
    src/core/lib/iomgr/tcp_server_uv.c \
    src/core/lib/iomgr/tcp_server_windows.c \
    src/core/lib/iomgr/tcp_uv.c \
    src/core/lib/iomgr/tcp_windows.c \
    src/core/lib/iomgr/time_averaged_stats.c \
-    src/core/lib/iomgr/timer.c \
+    src/core/lib/iomgr/timer_generic.c \
    src/core/lib/iomgr/timer_heap.c \
    src/core/lib/iomgr/timer_uv.c \
    src/core/lib/iomgr/udp_server.c \
    src/core/lib/iomgr/unix_sockets_posix.c \
    src/core/lib/iomgr/unix_sockets_posix_noop.c \
@ -145,6 +157,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/iomgr/wakeup_fd_nospecial.c \
    src/core/lib/iomgr/wakeup_fd_pipe.c \
    src/core/lib/iomgr/wakeup_fd_posix.c \
    src/core/lib/iomgr/workqueue_uv.c \
    src/core/lib/iomgr/workqueue_windows.c \
    src/core/lib/json/json.c \
    src/core/lib/json/json_reader.c \
@ -173,6 +186,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/transport/mdstr_hash_table.c \
    src/core/lib/transport/metadata.c \
    src/core/lib/transport/metadata_batch.c \
    src/core/lib/transport/method_config.c \
    src/core/lib/transport/static_metadata.c \
    src/core/lib/transport/timeout_encoding.c \
    src/core/lib/transport/transport.c \
@ -206,8 +220,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/security/credentials/credentials.c \
    src/core/lib/security/credentials/credentials_metadata.c \
    src/core/lib/security/credentials/fake/fake_credentials.c \
-    src/core/lib/security/credentials/google_default/credentials_posix.c \
+    src/core/lib/security/credentials/google_default/credentials_generic.c \
    src/core/lib/security/credentials/google_default/credentials_windows.c \
    src/core/lib/security/credentials/google_default/google_default_credentials.c \
    src/core/lib/security/credentials/iam/iam_credentials.c \
    src/core/lib/security/credentials/jwt/json_token.c \
@ -240,12 +253,10 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/client_channel/lb_policy.c \
    src/core/ext/client_channel/lb_policy_factory.c \
    src/core/ext/client_channel/lb_policy_registry.c \
    src/core/ext/client_channel/method_config.c \
    src/core/ext/client_channel/parse_address.c \
    src/core/ext/client_channel/resolver.c \
    src/core/ext/client_channel/resolver_factory.c \
    src/core/ext/client_channel/resolver_registry.c \
    src/core/ext/client_channel/resolver_result.c \
    src/core/ext/client_channel/subchannel.c \
    src/core/ext/client_channel/subchannel_index.c \
    src/core/ext/client_channel/uri_parser.c \
--- a/doc/images/stress_test_framework.png
+++ b/doc/images/stress_test_framework.png
--- a/doc/stress_test_framework.md
+++ b/doc/stress_test_framework.md
@ -0,0 +1,92 @@
 # Stress Test framework for gRPC
 (Sree Kuchibhotla - sreek@)
 > Status: This is implemented. More details at [README.md](https://github.com/grpc/grpc/blob/master/tools/run_tests/stress_test/README.md)
 **I. GOALS**
 1) Build a stress test suite for gRPC:
 * Build a stress test suite that can Identify bugs by testing the system (gRPC server/client) under extreme conditions:
  * High load
  * High concurrency
  * Limited resources 
  * Intermittent failures
 * Should be integrated with Jenkins CI
 2) Make it generic enough (i.e build a generic test framework) that can be used for:
 * Executing M instances of a client against N instances of a server with an arbitrarily defined connection matrix
   * Execute heterogenous test configurations - for example: Java stress test clients against C++ servers or Node clients against Python servers or TSAN C++ clients vs ASAN C++ Servers etc.
   * Easy and Flexible enough that Devs can use it to recreate complex test scenarios
 The implementation effort is divided into two parts:
 * Building a "Stress Test Framework" to run the stress test suites- More details in **Section II** (The idea is that the Stress Test framework is generic enough that it would be easier to modify it to run other suites like interop-tests or custom test scenarios)
 * Building a 'Stress test suite' - More details in **section III**
 **Terminology:**
 GCE - Google compute engine
 GKE - Google Container engine
 Kubernetes - Google's open source service scheduler / orchestrator.
 **Note:** The terms GKE and Kubernetes are used interchangeably in this document
 # II. STRESS TEST FRAMEWORK
 (The details of each step are explained below))
 ![image](images/stress_test_framework.png)
 **Figure 1**
 ### Step 1 Read the test config, generate base docker images
 **_Test Config:_** The test configuration contains the following information:
 * _GKE info:_ GKE project and cluster info
 * _Docker images:_ Instructions to build docker images
 * _Client templates:_ One or more client templates each containing the following information:
    * Which docker image to use
    * Path to the client program to launch (within the docker image)
    * Parameters to the client program
 * _Server templates:_ Similar to Client templates - except that these are for servers
 * Test matrix containing the following:
    * _Server groups:_ One or more groups of servers containing the following info for each group
        * Which server template to use
        * How many instances to launch
    * _Client groups:_ One or more groups of clients containing the following (for each group):
        * Which client template to use
        * How many instances to launch
        * Which server group to talk to (all clients in this group will talk to all servers in the server group)
 The first step is to read the test config and build the docker images
 **_Stress server docker image:_** The following are the main files in the server docker images
 * _Interop_server:_ The server program
 * `run_server.py`: This is a python script which is the entry point of the docker image (i.e this is the script that is called when the docker image is run in GKE).  This script launches the interop server and also updates the status in BigQuery.  If the interop_server fails for whatever reason, the script launch_server.py logs that status in BigQuery
 **_Stress client docker image:_**
 * Stress client: The stress test client.  In addition to talking to the interop_server, the stress client also exports metrics (which can be queried by the metrics_client described below)
 * Metrics client: Metrics client connects to the stress_client to get the current qps metrics.
 * `run_client.py`: This is a python script which is the entry point of the docker image (i.e this is the script that is called when the docker image is run in GKE). This script launches the stress client and also updates the status in BigQuery.  The script then periodically launches metrics client to query the qps from the stress client and then uploads the qps to BigQuery.
 ### Step 2) Upload the docker images to GKE
 The docker images are uploaded to the GKE registry
 ### Step 3) Launch the tests in GKE
 The test driver reads the test matrix (described in step 1) and creates the necessary server and client pods in GKE.
 ### Step 4) Tests are run in GKE
 GKE starts running the tests by calling the entry points in *each* docker image (i.e `run_server.py` or `run_client.py` depending on whcih docker image it is)
 ### Step 5) Upload the status to GKE and Monitor the status in GKE
 * 5.1 The tests periodically update their status in BigQuery
 * 5.2 The test driver periodically checks the status in Bigquery to see if any tests failed.  If any tests failed, the driver immediately stops the tests.  If not, the driver continues to run the tests for a configurable amount of time.
 ### Step 6) Create a summary report
 The test driver creates a final summary report containing details about any test failures and information about how to connect the failed pods in GKE for debugging.
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -35,7 +35,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.0.0'
+  version = '1.0.1'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'http://www.grpc.io'
@ -186,7 +186,7 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.libraries = 'z'
    ss.dependency "#{s.name}/Interface", version
-    ss.dependency 'BoringSSL', '~> 6.0'
+    ss.dependency 'BoringSSL', '~> 7.0'
    # To save you from scrolling, this is the last part of the podspec.
    ss.source_files = 'src/core/lib/profiling/timers.h',
@ -287,27 +287,36 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/pollset.h',
                      'src/core/lib/iomgr/pollset_set.h',
                      'src/core/lib/iomgr/pollset_set_windows.h',
                      'src/core/lib/iomgr/pollset_uv.h',
                      'src/core/lib/iomgr/pollset_windows.h',
                      'src/core/lib/iomgr/port.h',
                      'src/core/lib/iomgr/resolve_address.h',
                      'src/core/lib/iomgr/resource_quota.h',
                      'src/core/lib/iomgr/sockaddr.h',
                      'src/core/lib/iomgr/sockaddr_posix.h',
                      'src/core/lib/iomgr/sockaddr_utils.h',
                      'src/core/lib/iomgr/sockaddr_windows.h',
                      'src/core/lib/iomgr/socket_utils.h',
                      'src/core/lib/iomgr/socket_utils_posix.h',
                      'src/core/lib/iomgr/socket_windows.h',
                      'src/core/lib/iomgr/tcp_client.h',
                      'src/core/lib/iomgr/tcp_client_posix.h',
                      'src/core/lib/iomgr/tcp_posix.h',
                      'src/core/lib/iomgr/tcp_server.h',
                      'src/core/lib/iomgr/tcp_uv.h',
                      'src/core/lib/iomgr/tcp_windows.h',
                      'src/core/lib/iomgr/time_averaged_stats.h',
                      'src/core/lib/iomgr/timer.h',
                      'src/core/lib/iomgr/timer_generic.h',
                      'src/core/lib/iomgr/timer_heap.h',
                      'src/core/lib/iomgr/timer_uv.h',
                      'src/core/lib/iomgr/udp_server.h',
                      'src/core/lib/iomgr/unix_sockets_posix.h',
                      'src/core/lib/iomgr/wakeup_fd_cv.h',
                      'src/core/lib/iomgr/wakeup_fd_pipe.h',
                      'src/core/lib/iomgr/wakeup_fd_posix.h',
                      'src/core/lib/iomgr/workqueue.h',
                      'src/core/lib/iomgr/workqueue_uv.h',
                      'src/core/lib/iomgr/workqueue_windows.h',
                      'src/core/lib/json/json.h',
                      'src/core/lib/json/json_common.h',
@ -329,6 +338,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/transport/mdstr_hash_table.h',
                      'src/core/lib/transport/metadata.h',
                      'src/core/lib/transport/metadata_batch.h',
                      'src/core/lib/transport/method_config.h',
                      'src/core/lib/transport/static_metadata.h',
                      'src/core/lib/transport/timeout_encoding.h',
                      'src/core/lib/transport/transport.h',
@ -386,12 +396,10 @@ Pod::Spec.new do |s|
                      'src/core/ext/client_channel/lb_policy.h',
                      'src/core/ext/client_channel/lb_policy_factory.h',
                      'src/core/ext/client_channel/lb_policy_registry.h',
                      'src/core/ext/client_channel/method_config.h',
                      'src/core/ext/client_channel/parse_address.h',
                      'src/core/ext/client_channel/resolver.h',
                      'src/core/ext/client_channel/resolver_factory.h',
                      'src/core/ext/client_channel/resolver_registry.h',
                      'src/core/ext/client_channel/resolver_result.h',
                      'src/core/ext/client_channel/subchannel.h',
                      'src/core/ext/client_channel/subchannel_index.h',
                      'src/core/ext/client_channel/uri_parser.h',
@ -436,6 +444,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/combiner.c',
                      'src/core/lib/iomgr/endpoint.c',
                      'src/core/lib/iomgr/endpoint_pair_posix.c',
                      'src/core/lib/iomgr/endpoint_pair_uv.c',
                      'src/core/lib/iomgr/endpoint_pair_windows.c',
                      'src/core/lib/iomgr/error.c',
                      'src/core/lib/iomgr/ev_epoll_linux.c',
@ -447,28 +456,39 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/iocp_windows.c',
                      'src/core/lib/iomgr/iomgr.c',
                      'src/core/lib/iomgr/iomgr_posix.c',
                      'src/core/lib/iomgr/iomgr_uv.c',
                      'src/core/lib/iomgr/iomgr_windows.c',
                      'src/core/lib/iomgr/load_file.c',
                      'src/core/lib/iomgr/network_status_tracker.c',
                      'src/core/lib/iomgr/polling_entity.c',
                      'src/core/lib/iomgr/pollset_set_uv.c',
                      'src/core/lib/iomgr/pollset_set_windows.c',
                      'src/core/lib/iomgr/pollset_uv.c',
                      'src/core/lib/iomgr/pollset_windows.c',
                      'src/core/lib/iomgr/resolve_address_posix.c',
                      'src/core/lib/iomgr/resolve_address_uv.c',
                      'src/core/lib/iomgr/resolve_address_windows.c',
                      'src/core/lib/iomgr/resource_quota.c',
                      'src/core/lib/iomgr/sockaddr_utils.c',
                      'src/core/lib/iomgr/socket_utils_common_posix.c',
                      'src/core/lib/iomgr/socket_utils_linux.c',
                      'src/core/lib/iomgr/socket_utils_posix.c',
                      'src/core/lib/iomgr/socket_utils_uv.c',
                      'src/core/lib/iomgr/socket_utils_windows.c',
                      'src/core/lib/iomgr/socket_windows.c',
                      'src/core/lib/iomgr/tcp_client_posix.c',
                      'src/core/lib/iomgr/tcp_client_uv.c',
                      'src/core/lib/iomgr/tcp_client_windows.c',
                      'src/core/lib/iomgr/tcp_posix.c',
                      'src/core/lib/iomgr/tcp_server_posix.c',
                      'src/core/lib/iomgr/tcp_server_uv.c',
                      'src/core/lib/iomgr/tcp_server_windows.c',
                      'src/core/lib/iomgr/tcp_uv.c',
                      'src/core/lib/iomgr/tcp_windows.c',
                      'src/core/lib/iomgr/time_averaged_stats.c',
-                      'src/core/lib/iomgr/timer.c',
+                      'src/core/lib/iomgr/timer_generic.c',
                      'src/core/lib/iomgr/timer_heap.c',
                      'src/core/lib/iomgr/timer_uv.c',
                      'src/core/lib/iomgr/udp_server.c',
                      'src/core/lib/iomgr/unix_sockets_posix.c',
                      'src/core/lib/iomgr/unix_sockets_posix_noop.c',
@ -477,6 +497,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/iomgr/wakeup_fd_nospecial.c',
                      'src/core/lib/iomgr/wakeup_fd_pipe.c',
                      'src/core/lib/iomgr/wakeup_fd_posix.c',
                      'src/core/lib/iomgr/workqueue_uv.c',
                      'src/core/lib/iomgr/workqueue_windows.c',
                      'src/core/lib/json/json.c',
                      'src/core/lib/json/json_reader.c',
@ -505,6 +526,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/transport/mdstr_hash_table.c',
                      'src/core/lib/transport/metadata.c',
                      'src/core/lib/transport/metadata_batch.c',
                      'src/core/lib/transport/method_config.c',
                      'src/core/lib/transport/static_metadata.c',
                      'src/core/lib/transport/timeout_encoding.c',
                      'src/core/lib/transport/transport.c',
@ -538,8 +560,7 @@ Pod::Spec.new do |s|
                      'src/core/lib/security/credentials/credentials.c',
                      'src/core/lib/security/credentials/credentials_metadata.c',
                      'src/core/lib/security/credentials/fake/fake_credentials.c',
-                      'src/core/lib/security/credentials/google_default/credentials_posix.c',
+                      'src/core/lib/security/credentials/google_default/credentials_generic.c',
                      'src/core/lib/security/credentials/google_default/credentials_windows.c',
                      'src/core/lib/security/credentials/google_default/google_default_credentials.c',
                      'src/core/lib/security/credentials/iam/iam_credentials.c',
                      'src/core/lib/security/credentials/jwt/json_token.c',
@ -572,12 +593,10 @@ Pod::Spec.new do |s|
                      'src/core/ext/client_channel/lb_policy.c',
                      'src/core/ext/client_channel/lb_policy_factory.c',
                      'src/core/ext/client_channel/lb_policy_registry.c',
                      'src/core/ext/client_channel/method_config.c',
                      'src/core/ext/client_channel/parse_address.c',
                      'src/core/ext/client_channel/resolver.c',
                      'src/core/ext/client_channel/resolver_factory.c',
                      'src/core/ext/client_channel/resolver_registry.c',
                      'src/core/ext/client_channel/resolver_result.c',
                      'src/core/ext/client_channel/subchannel.c',
                      'src/core/ext/client_channel/subchannel_index.c',
                      'src/core/ext/client_channel/uri_parser.c',
@ -664,27 +683,36 @@ Pod::Spec.new do |s|
                              'src/core/lib/iomgr/pollset.h',
                              'src/core/lib/iomgr/pollset_set.h',
                              'src/core/lib/iomgr/pollset_set_windows.h',
                              'src/core/lib/iomgr/pollset_uv.h',
                              'src/core/lib/iomgr/pollset_windows.h',
                              'src/core/lib/iomgr/port.h',
                              'src/core/lib/iomgr/resolve_address.h',
                              'src/core/lib/iomgr/resource_quota.h',
                              'src/core/lib/iomgr/sockaddr.h',
                              'src/core/lib/iomgr/sockaddr_posix.h',
                              'src/core/lib/iomgr/sockaddr_utils.h',
                              'src/core/lib/iomgr/sockaddr_windows.h',
                              'src/core/lib/iomgr/socket_utils.h',
                              'src/core/lib/iomgr/socket_utils_posix.h',
                              'src/core/lib/iomgr/socket_windows.h',
                              'src/core/lib/iomgr/tcp_client.h',
                              'src/core/lib/iomgr/tcp_client_posix.h',
                              'src/core/lib/iomgr/tcp_posix.h',
                              'src/core/lib/iomgr/tcp_server.h',
                              'src/core/lib/iomgr/tcp_uv.h',
                              'src/core/lib/iomgr/tcp_windows.h',
                              'src/core/lib/iomgr/time_averaged_stats.h',
                              'src/core/lib/iomgr/timer.h',
                              'src/core/lib/iomgr/timer_generic.h',
                              'src/core/lib/iomgr/timer_heap.h',
                              'src/core/lib/iomgr/timer_uv.h',
                              'src/core/lib/iomgr/udp_server.h',
                              'src/core/lib/iomgr/unix_sockets_posix.h',
                              'src/core/lib/iomgr/wakeup_fd_cv.h',
                              'src/core/lib/iomgr/wakeup_fd_pipe.h',
                              'src/core/lib/iomgr/wakeup_fd_posix.h',
                              'src/core/lib/iomgr/workqueue.h',
                              'src/core/lib/iomgr/workqueue_uv.h',
                              'src/core/lib/iomgr/workqueue_windows.h',
                              'src/core/lib/json/json.h',
                              'src/core/lib/json/json_common.h',
@ -706,6 +734,7 @@ Pod::Spec.new do |s|
                              'src/core/lib/transport/mdstr_hash_table.h',
                              'src/core/lib/transport/metadata.h',
                              'src/core/lib/transport/metadata_batch.h',
                              'src/core/lib/transport/method_config.h',
                              'src/core/lib/transport/static_metadata.h',
                              'src/core/lib/transport/timeout_encoding.h',
                              'src/core/lib/transport/transport.h',
@ -763,12 +792,10 @@ Pod::Spec.new do |s|
                              'src/core/ext/client_channel/lb_policy.h',
                              'src/core/ext/client_channel/lb_policy_factory.h',
                              'src/core/ext/client_channel/lb_policy_registry.h',
                              'src/core/ext/client_channel/method_config.h',
                              'src/core/ext/client_channel/parse_address.h',
                              'src/core/ext/client_channel/resolver.h',
                              'src/core/ext/client_channel/resolver_factory.h',
                              'src/core/ext/client_channel/resolver_registry.h',
                              'src/core/ext/client_channel/resolver_result.h',
                              'src/core/ext/client_channel/subchannel.h',
                              'src/core/ext/client_channel/subchannel_index.h',
                              'src/core/ext/client_channel/uri_parser.h',
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -30,7 +30,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.0.0'
+  version = '1.0.1'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -30,7 +30,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.0.0'
+  version = '1.0.1'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -30,7 +30,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.0.0'
+  version = '1.0.1'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'http://www.grpc.io'
--- a/grpc.def
+++ b/grpc.def
@ -94,6 +94,11 @@ EXPORTS
    grpc_header_nonbin_value_is_legal
    grpc_is_binary_header
    grpc_call_error_to_string
    grpc_resource_quota_create
    grpc_resource_quota_ref
    grpc_resource_quota_unref
    grpc_resource_quota_resize
    grpc_resource_quota_arg_vtable
    grpc_insecure_channel_create_from_fd
    grpc_server_add_insecure_channel_from_fd
    grpc_use_signal
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -207,27 +207,36 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/pollset.h )
  s.files += %w( src/core/lib/iomgr/pollset_set.h )
  s.files += %w( src/core/lib/iomgr/pollset_set_windows.h )
  s.files += %w( src/core/lib/iomgr/pollset_uv.h )
  s.files += %w( src/core/lib/iomgr/pollset_windows.h )
  s.files += %w( src/core/lib/iomgr/port.h )
  s.files += %w( src/core/lib/iomgr/resolve_address.h )
  s.files += %w( src/core/lib/iomgr/resource_quota.h )
  s.files += %w( src/core/lib/iomgr/sockaddr.h )
  s.files += %w( src/core/lib/iomgr/sockaddr_posix.h )
  s.files += %w( src/core/lib/iomgr/sockaddr_utils.h )
  s.files += %w( src/core/lib/iomgr/sockaddr_windows.h )
  s.files += %w( src/core/lib/iomgr/socket_utils.h )
  s.files += %w( src/core/lib/iomgr/socket_utils_posix.h )
  s.files += %w( src/core/lib/iomgr/socket_windows.h )
  s.files += %w( src/core/lib/iomgr/tcp_client.h )
  s.files += %w( src/core/lib/iomgr/tcp_client_posix.h )
  s.files += %w( src/core/lib/iomgr/tcp_posix.h )
  s.files += %w( src/core/lib/iomgr/tcp_server.h )
  s.files += %w( src/core/lib/iomgr/tcp_uv.h )
  s.files += %w( src/core/lib/iomgr/tcp_windows.h )
  s.files += %w( src/core/lib/iomgr/time_averaged_stats.h )
  s.files += %w( src/core/lib/iomgr/timer.h )
  s.files += %w( src/core/lib/iomgr/timer_generic.h )
  s.files += %w( src/core/lib/iomgr/timer_heap.h )
  s.files += %w( src/core/lib/iomgr/timer_uv.h )
  s.files += %w( src/core/lib/iomgr/udp_server.h )
  s.files += %w( src/core/lib/iomgr/unix_sockets_posix.h )
  s.files += %w( src/core/lib/iomgr/wakeup_fd_cv.h )
  s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h )
  s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h )
  s.files += %w( src/core/lib/iomgr/workqueue.h )
  s.files += %w( src/core/lib/iomgr/workqueue_uv.h )
  s.files += %w( src/core/lib/iomgr/workqueue_windows.h )
  s.files += %w( src/core/lib/json/json.h )
  s.files += %w( src/core/lib/json/json_common.h )
@ -249,6 +258,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/transport/mdstr_hash_table.h )
  s.files += %w( src/core/lib/transport/metadata.h )
  s.files += %w( src/core/lib/transport/metadata_batch.h )
  s.files += %w( src/core/lib/transport/method_config.h )
  s.files += %w( src/core/lib/transport/static_metadata.h )
  s.files += %w( src/core/lib/transport/timeout_encoding.h )
  s.files += %w( src/core/lib/transport/transport.h )
@ -306,12 +316,10 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/client_channel/lb_policy.h )
  s.files += %w( src/core/ext/client_channel/lb_policy_factory.h )
  s.files += %w( src/core/ext/client_channel/lb_policy_registry.h )
  s.files += %w( src/core/ext/client_channel/method_config.h )
  s.files += %w( src/core/ext/client_channel/parse_address.h )
  s.files += %w( src/core/ext/client_channel/resolver.h )
  s.files += %w( src/core/ext/client_channel/resolver_factory.h )
  s.files += %w( src/core/ext/client_channel/resolver_registry.h )
  s.files += %w( src/core/ext/client_channel/resolver_result.h )
  s.files += %w( src/core/ext/client_channel/subchannel.h )
  s.files += %w( src/core/ext/client_channel/subchannel_index.h )
  s.files += %w( src/core/ext/client_channel/uri_parser.h )
@ -356,6 +364,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/combiner.c )
  s.files += %w( src/core/lib/iomgr/endpoint.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_posix.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_uv.c )
  s.files += %w( src/core/lib/iomgr/endpoint_pair_windows.c )
  s.files += %w( src/core/lib/iomgr/error.c )
  s.files += %w( src/core/lib/iomgr/ev_epoll_linux.c )
@ -367,28 +376,39 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/iocp_windows.c )
  s.files += %w( src/core/lib/iomgr/iomgr.c )
  s.files += %w( src/core/lib/iomgr/iomgr_posix.c )
  s.files += %w( src/core/lib/iomgr/iomgr_uv.c )
  s.files += %w( src/core/lib/iomgr/iomgr_windows.c )
  s.files += %w( src/core/lib/iomgr/load_file.c )
  s.files += %w( src/core/lib/iomgr/network_status_tracker.c )
  s.files += %w( src/core/lib/iomgr/polling_entity.c )
  s.files += %w( src/core/lib/iomgr/pollset_set_uv.c )
  s.files += %w( src/core/lib/iomgr/pollset_set_windows.c )
  s.files += %w( src/core/lib/iomgr/pollset_uv.c )
  s.files += %w( src/core/lib/iomgr/pollset_windows.c )
  s.files += %w( src/core/lib/iomgr/resolve_address_posix.c )
  s.files += %w( src/core/lib/iomgr/resolve_address_uv.c )
  s.files += %w( src/core/lib/iomgr/resolve_address_windows.c )
  s.files += %w( src/core/lib/iomgr/resource_quota.c )
  s.files += %w( src/core/lib/iomgr/sockaddr_utils.c )
  s.files += %w( src/core/lib/iomgr/socket_utils_common_posix.c )
  s.files += %w( src/core/lib/iomgr/socket_utils_linux.c )
  s.files += %w( src/core/lib/iomgr/socket_utils_posix.c )
  s.files += %w( src/core/lib/iomgr/socket_utils_uv.c )
  s.files += %w( src/core/lib/iomgr/socket_utils_windows.c )
  s.files += %w( src/core/lib/iomgr/socket_windows.c )
  s.files += %w( src/core/lib/iomgr/tcp_client_posix.c )
  s.files += %w( src/core/lib/iomgr/tcp_client_uv.c )
  s.files += %w( src/core/lib/iomgr/tcp_client_windows.c )
  s.files += %w( src/core/lib/iomgr/tcp_posix.c )
  s.files += %w( src/core/lib/iomgr/tcp_server_posix.c )
  s.files += %w( src/core/lib/iomgr/tcp_server_uv.c )
  s.files += %w( src/core/lib/iomgr/tcp_server_windows.c )
  s.files += %w( src/core/lib/iomgr/tcp_uv.c )
  s.files += %w( src/core/lib/iomgr/tcp_windows.c )
  s.files += %w( src/core/lib/iomgr/time_averaged_stats.c )
-  s.files += %w( src/core/lib/iomgr/timer.c )
+  s.files += %w( src/core/lib/iomgr/timer_generic.c )
  s.files += %w( src/core/lib/iomgr/timer_heap.c )
  s.files += %w( src/core/lib/iomgr/timer_uv.c )
  s.files += %w( src/core/lib/iomgr/udp_server.c )
  s.files += %w( src/core/lib/iomgr/unix_sockets_posix.c )
  s.files += %w( src/core/lib/iomgr/unix_sockets_posix_noop.c )
@ -397,6 +417,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/iomgr/wakeup_fd_nospecial.c )
  s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.c )
  s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.c )
  s.files += %w( src/core/lib/iomgr/workqueue_uv.c )
  s.files += %w( src/core/lib/iomgr/workqueue_windows.c )
  s.files += %w( src/core/lib/json/json.c )
  s.files += %w( src/core/lib/json/json_reader.c )
@ -425,6 +446,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/transport/mdstr_hash_table.c )
  s.files += %w( src/core/lib/transport/metadata.c )
  s.files += %w( src/core/lib/transport/metadata_batch.c )
  s.files += %w( src/core/lib/transport/method_config.c )
  s.files += %w( src/core/lib/transport/static_metadata.c )
  s.files += %w( src/core/lib/transport/timeout_encoding.c )
  s.files += %w( src/core/lib/transport/transport.c )
@ -458,8 +480,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/security/credentials/credentials.c )
  s.files += %w( src/core/lib/security/credentials/credentials_metadata.c )
  s.files += %w( src/core/lib/security/credentials/fake/fake_credentials.c )
-  s.files += %w( src/core/lib/security/credentials/google_default/credentials_posix.c )
+  s.files += %w( src/core/lib/security/credentials/google_default/credentials_generic.c )
  s.files += %w( src/core/lib/security/credentials/google_default/credentials_windows.c )
  s.files += %w( src/core/lib/security/credentials/google_default/google_default_credentials.c )
  s.files += %w( src/core/lib/security/credentials/iam/iam_credentials.c )
  s.files += %w( src/core/lib/security/credentials/jwt/json_token.c )
@ -492,12 +513,10 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/client_channel/lb_policy.c )
  s.files += %w( src/core/ext/client_channel/lb_policy_factory.c )
  s.files += %w( src/core/ext/client_channel/lb_policy_registry.c )
  s.files += %w( src/core/ext/client_channel/method_config.c )
  s.files += %w( src/core/ext/client_channel/parse_address.c )
  s.files += %w( src/core/ext/client_channel/resolver.c )
  s.files += %w( src/core/ext/client_channel/resolver_factory.c )
  s.files += %w( src/core/ext/client_channel/resolver_registry.c )
  s.files += %w( src/core/ext/client_channel/resolver_result.c )
  s.files += %w( src/core/ext/client_channel/subchannel.c )
  s.files += %w( src/core/ext/client_channel/subchannel_index.c )
  s.files += %w( src/core/ext/client_channel/uri_parser.c )
--- a/include/grpc++/ext/reflection.grpc.pb.h
+++ b/include/grpc++/ext/reflection.grpc.pb.h
@ -1,188 +0,0 @@
 /*
 *
 * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 // Generated by tools/codegen/extensions/gen_reflection_proto.sh
 // If you make any local change, they will be lost.
 // source: reflection.proto
 // Original file comments:
 // Copyright 2016, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Service exported by server reflection
 //
 #ifndef GRPC_reflection_2eproto__INCLUDED
 #define GRPC_reflection_2eproto__INCLUDED
 #include <grpc++/ext/reflection.pb.h>
 #include <grpc++/impl/codegen/async_stream.h>
 #include <grpc++/impl/codegen/async_unary_call.h>
 #include <grpc++/impl/codegen/method_handler_impl.h>
 #include <grpc++/impl/codegen/proto_utils.h>
 #include <grpc++/impl/codegen/rpc_method.h>
 #include <grpc++/impl/codegen/service_type.h>
 #include <grpc++/impl/codegen/status.h>
 #include <grpc++/impl/codegen/stub_options.h>
 #include <grpc++/impl/codegen/sync_stream.h>
 namespace grpc {
 class CompletionQueue;
 class Channel;
 class RpcService;
 class ServerCompletionQueue;
 class ServerContext;
 }  // namespace grpc
 namespace grpc {
 namespace reflection {
 namespace v1alpha {
 class ServerReflection GRPC_FINAL {
 public:
  class StubInterface {
   public:
    virtual ~StubInterface() {}
    // The reflection service is structured as a bidirectional stream, ensuring
    // all related requests go to a single server.
    std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> ServerReflectionInfo(::grpc::ClientContext* context) {
      return std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(ServerReflectionInfoRaw(context));
    }
    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> AsyncServerReflectionInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(AsyncServerReflectionInfoRaw(context, cq, tag));
    }
  private:
    virtual ::grpc::ClientReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflectionInfoRaw(::grpc::ClientContext* context) = 0;
    virtual ::grpc::ClientAsyncReaderWriterInterface< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* AsyncServerReflectionInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) = 0;
  };
  class Stub GRPC_FINAL : public StubInterface {
   public:
    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel);
    std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> ServerReflectionInfo(::grpc::ClientContext* context) {
      return std::unique_ptr< ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(ServerReflectionInfoRaw(context));
    }
    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>> AsyncServerReflectionInfo(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>>(AsyncServerReflectionInfoRaw(context, cq, tag));
    }
   private:
    std::shared_ptr< ::grpc::ChannelInterface> channel_;
    ::grpc::ClientReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* ServerReflectionInfoRaw(::grpc::ClientContext* context) GRPC_OVERRIDE;
    ::grpc::ClientAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionRequest, ::grpc::reflection::v1alpha::ServerReflectionResponse>* AsyncServerReflectionInfoRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) GRPC_OVERRIDE;
    const ::grpc::RpcMethod rpcmethod_ServerReflectionInfo_;
  };
  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
  class Service : public ::grpc::Service {
   public:
    Service();
    virtual ~Service();
    // The reflection service is structured as a bidirectional stream, ensuring
    // all related requests go to a single server.
    virtual ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream);
  };
  template <class BaseClass>
  class WithAsyncMethod_ServerReflectionInfo : public BaseClass {
   private:
    void BaseClassMustBeDerivedFromService(const Service *service) {}
   public:
    WithAsyncMethod_ServerReflectionInfo() {
      ::grpc::Service::MarkMethodAsync(0);
    }
    ~WithAsyncMethod_ServerReflectionInfo() GRPC_OVERRIDE {
      BaseClassMustBeDerivedFromService(this);
    }
    // disable synchronous version of this method
    ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
      abort();
      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
    }
    void RequestServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
      ::grpc::Service::RequestAsyncBidiStreaming(0, context, stream, new_call_cq, notification_cq, tag);
    }
  };
  typedef WithAsyncMethod_ServerReflectionInfo<Service > AsyncService;
  template <class BaseClass>
  class WithGenericMethod_ServerReflectionInfo : public BaseClass {
   private:
    void BaseClassMustBeDerivedFromService(const Service *service) {}
   public:
    WithGenericMethod_ServerReflectionInfo() {
      ::grpc::Service::MarkMethodGeneric(0);
    }
    ~WithGenericMethod_ServerReflectionInfo() GRPC_OVERRIDE {
      BaseClassMustBeDerivedFromService(this);
    }
    // disable synchronous version of this method
    ::grpc::Status ServerReflectionInfo(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::grpc::reflection::v1alpha::ServerReflectionResponse, ::grpc::reflection::v1alpha::ServerReflectionRequest>* stream) GRPC_FINAL GRPC_OVERRIDE {
      abort();
      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
    }
  };
  typedef Service StreamedUnaryService;
  typedef Service SplitStreamedService;
  typedef Service StreamedService;
 };
 }  // namespace v1alpha
 }  // namespace reflection
 }  // namespace grpc
 #endif  // GRPC_reflection_2eproto__INCLUDED
--- a/include/grpc++/ext/reflection.pb.h
+++ b/include/grpc++/ext/reflection.pb.h
--- a/include/grpc++/impl/codegen/server_interface.h
+++ b/include/grpc++/impl/codegen/server_interface.h
@ -126,12 +126,6 @@ class ServerInterface : public CallHook {
  /// \return true on a successful shutdown.
  virtual bool Start(ServerCompletionQueue** cqs, size_t num_cqs) = 0;
  /// Process one or more incoming calls.
  virtual void RunRpc() = 0;
  /// Schedule \a RunRpc to run in the threadpool.
  virtual void ScheduleCallback() = 0;
  virtual void ShutdownInternal(gpr_timespec deadline) = 0;
  virtual int max_receive_message_size() const = 0;
--- a/include/grpc++/resource_quota.h
+++ b/include/grpc++/resource_quota.h
@ -0,0 +1,70 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #ifndef GRPCXX_RESOURCE_QUOTA_H
 #define GRPCXX_RESOURCE_QUOTA_H
 struct grpc_resource_quota;
 #include <grpc++/impl/codegen/config.h>
 namespace grpc {
 /// ResourceQuota represents a bound on memory usage by the gRPC library.
 /// A ResourceQuota can be attached to a server (via ServerBuilder), or a client
 /// channel (via ChannelArguments). gRPC will attempt to keep memory used by
 /// all attached entities below the ResourceQuota bound.
 class ResourceQuota GRPC_FINAL {
 public:
  explicit ResourceQuota(const grpc::string& name);
  ResourceQuota();
  ~ResourceQuota();
  /// Resize this ResourceQuota to a new size. If new_size is smaller than the
  /// current size of the pool, memory usage will be monotonically decreased
  /// until it falls under new_size. No time bound is given for this to occur
  /// however.
  ResourceQuota& Resize(size_t new_size);
  grpc_resource_quota* c_resource_quota() const { return impl_; }
 private:
  ResourceQuota(const ResourceQuota& rhs);
  ResourceQuota& operator=(const ResourceQuota& rhs);
  grpc_resource_quota* const impl_;
 };
 }  // namespace grpc
 #endif  // GRPCXX_RESOURCE_QUOTA_H
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@ -105,18 +105,41 @@ class Server GRPC_FINAL : public ServerInterface, private GrpcLibraryCodegen {
  class AsyncRequest;
  class ShutdownRequest;
  /// SyncRequestThreadManager is an implementation of ThreadManager. This class
  /// is responsible for polling for incoming RPCs and calling the RPC handlers.
  /// This is only used in case of a Sync server (i.e a server exposing a sync
  /// interface)
  class SyncRequestThreadManager;
  class UnimplementedAsyncRequestContext;
  class UnimplementedAsyncRequest;
  class UnimplementedAsyncResponse;
  /// Server constructors. To be used by \a ServerBuilder only.
  ///
-  /// \param thread_pool The threadpool instance to use for call processing.
+  /// \param max_message_size Maximum message length that the channel can
-  /// \param thread_pool_owned Does the server own the \a thread_pool instance?
+  /// receive.
-  /// \param max_receive_message_size Maximum message length that the channel
+  ///
-  /// can receive.
+  /// \param args The channel args
-  Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned,
+  ///
-         int max_receive_message_size, ChannelArguments* args);
+  /// \param sync_server_cqs The completion queues to use if the server is a
  /// synchronous server (or a hybrid server). The server polls for new RPCs on
  /// these queues
  ///
  /// \param min_pollers The minimum number of polling threads per server
  /// completion queue (in param sync_server_cqs) to use for listening to
  /// incoming requests (used only in case of sync server)
  ///
  /// \param max_pollers The maximum number of polling threads per server
  /// completion queue (in param sync_server_cqs) to use for listening to
  /// incoming requests (used only in case of sync server)
  ///
  /// \param sync_cq_timeout_msec The timeout to use when calling AsyncNext() on
  /// server completion queues passed via sync_server_cqs param.
  Server(int max_message_size, ChannelArguments* args,
         std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
             sync_server_cqs,
         int min_pollers, int max_pollers, int sync_cq_timeout_msec);
  /// Register a service. This call does not take ownership of the service.
  /// The service must exist for the lifetime of the Server instance.
@ -151,12 +174,6 @@ class Server GRPC_FINAL : public ServerInterface, private GrpcLibraryCodegen {
  /// \return true on a successful shutdown.
  bool Start(ServerCompletionQueue** cqs, size_t num_cqs) GRPC_OVERRIDE;
  /// Process one or more incoming calls.
  void RunRpc() GRPC_OVERRIDE;
  /// Schedule \a RunRpc to run in the threadpool.
  void ScheduleCallback() GRPC_OVERRIDE;
  void PerformOpsOnCall(CallOpSetInterface* ops, Call* call) GRPC_OVERRIDE;
  void ShutdownInternal(gpr_timespec deadline) GRPC_OVERRIDE;
@ -171,34 +188,31 @@ class Server GRPC_FINAL : public ServerInterface, private GrpcLibraryCodegen {
  const int max_receive_message_size_;
-  // Completion queue.
+  /// The following completion queues are ONLY used in case of Sync API i.e if
-  CompletionQueue cq_;
+  /// the server has any services with sync methods. The server uses these
  /// completion queues to poll for new RPCs
  std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
      sync_server_cqs_;
  /// List of ThreadManager instances (one for each cq in the sync_server_cqs)
  std::vector<std::unique_ptr<SyncRequestThreadManager>> sync_req_mgrs_;
  // Sever status
  grpc::mutex mu_;
  bool started_;
  bool shutdown_;
-  bool shutdown_notified_;
+  bool shutdown_notified_;  // Was notify called on the shutdown_cv_
  // The number of threads which are running callbacks.
  int num_running_cb_;
  grpc::condition_variable callback_cv_;
  grpc::condition_variable shutdown_cv_;
  std::shared_ptr<GlobalCallbacks> global_callbacks_;
  std::list<SyncRequest>* sync_methods_;
  std::vector<grpc::string> services_;
  std::unique_ptr<RpcServiceMethod> unknown_method_;
  bool has_generic_service_;
-  // Pointer to the c grpc server.
+  // Pointer to the wrapped grpc_server.
  grpc_server* server_;
  ThreadPoolInterface* thread_pool_;
  // Whether the thread pool is created and owned by the server.
  bool thread_pool_owned_;
  std::unique_ptr<ServerInitializer> server_initializer_;
 };
--- a/include/grpc++/server_builder.h
+++ b/include/grpc++/server_builder.h
@ -34,6 +34,7 @@
 #ifndef GRPCXX_SERVER_BUILDER_H
 #define GRPCXX_SERVER_BUILDER_H
 #include <climits>
 #include <map>
 #include <memory>
 #include <vector>
@ -42,10 +43,15 @@
 #include <grpc++/impl/server_builder_plugin.h>
 #include <grpc++/support/config.h>
 #include <grpc/compression.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/useful.h>
 struct grpc_resource_quota;
 namespace grpc {
 class AsyncGenericService;
 class ResourceQuota;
 class CompletionQueue;
 class RpcService;
 class Server;
@ -61,6 +67,9 @@ class ServerBuilderPluginTest;
 class ServerBuilder {
 public:
  ServerBuilder();
  ~ServerBuilder();
  enum SyncServerOption { NUM_CQS, MIN_POLLERS, MAX_POLLERS, CQ_TIMEOUT_MSEC };
  /// Register a service. This call does not take ownership of the service.
  /// The service must exist for the lifetime of the \a Server instance returned
@ -113,8 +122,14 @@ class ServerBuilder {
  ServerBuilder& SetDefaultCompressionAlgorithm(
      grpc_compression_algorithm algorithm);
  /// Set the attached buffer pool for this server
  ServerBuilder& SetResourceQuota(const ResourceQuota& resource_quota);
  ServerBuilder& SetOption(std::unique_ptr<ServerBuilderOption> option);
  /// Only useful if this is a Synchronous server.
  ServerBuilder& SetSyncServerOption(SyncServerOption option, int value);
  /// Tries to bind \a server to the given \a addr.
  ///
  /// It can be invoked multiple times.
@ -170,6 +185,28 @@ class ServerBuilder {
    int* selected_port;
  };
  struct SyncServerSettings {
    SyncServerSettings()
        : num_cqs(GPR_MAX(gpr_cpu_num_cores(), 4)),
          min_pollers(1),
          max_pollers(INT_MAX),
          cq_timeout_msec(1000) {}
    // Number of server completion queues to create to listen to incoming RPCs.
    int num_cqs;
    // Minimum number of threads per completion queue that should be listening
    // to incoming RPCs.
    int min_pollers;
    // Maximum number of threads per completion queue that can be listening to
    // incoming RPCs.
    int max_pollers;
    // The timeout for server completion queue's AsyncNext call.
    int cq_timeout_msec;
  };
  typedef std::unique_ptr<grpc::string> HostString;
  struct NamedService {
    explicit NamedService(Service* s) : service(s) {}
@ -184,9 +221,15 @@ class ServerBuilder {
  std::vector<std::unique_ptr<ServerBuilderOption>> options_;
  std::vector<std::unique_ptr<NamedService>> services_;
  std::vector<Port> ports_;
  SyncServerSettings sync_server_settings_;
  // List of completion queues added via AddCompletionQueue() method
  std::vector<ServerCompletionQueue*> cqs_;
  std::shared_ptr<ServerCredentials> creds_;
  std::vector<std::unique_ptr<ServerBuilderPlugin>> plugins_;
  grpc_resource_quota* resource_quota_;
  AsyncGenericService* generic_service_;
  struct {
    bool is_set;
--- a/include/grpc++/support/channel_arguments.h
+++ b/include/grpc++/support/channel_arguments.h
@ -46,6 +46,8 @@ namespace testing {
 class ChannelArgumentsTest;
 }  // namespace testing
 class ResourceQuota;
 /// Options for channel creation. The user can use generic setters to pass
 /// key value pairs down to c channel creation code. For grpc related options,
 /// concrete setters are provided.
@ -80,6 +82,9 @@ class ChannelArguments {
  /// The given string will be sent at the front of the user agent string.
  void SetUserAgentPrefix(const grpc::string& user_agent_prefix);
  /// The given buffer pool will be attached to the constructed channel
  void SetResourceQuota(const ResourceQuota& resource_quota);
  // Generic channel argument setters. Only for advanced use cases.
  /// Set an integer argument \a value under \a key.
  void SetInt(const grpc::string& key, int value);
@ -88,6 +93,9 @@ class ChannelArguments {
  /// Set a pointer argument \a value under \a key. Owership is not transferred.
  void SetPointer(const grpc::string& key, void* value);
  void SetPointerWithVtable(const grpc::string& key, void* value,
                            const grpc_arg_pointer_vtable* vtable);
  /// Set a textual argument \a value under \a key.
  void SetString(const grpc::string& key, const grpc::string& value);
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -401,6 +401,23 @@ GRPCAPI int grpc_is_binary_header(const char *key, size_t length);
 /** Convert grpc_call_error values to a string */
 GRPCAPI const char *grpc_call_error_to_string(grpc_call_error error);
 /** Create a buffer pool */
 GRPCAPI grpc_resource_quota *grpc_resource_quota_create(const char *trace_name);
 /** Add a reference to a buffer pool */
 GRPCAPI void grpc_resource_quota_ref(grpc_resource_quota *resource_quota);
 /** Drop a reference to a buffer pool */
 GRPCAPI void grpc_resource_quota_unref(grpc_resource_quota *resource_quota);
 /** Update the size of a buffer pool */
 GRPCAPI void grpc_resource_quota_resize(grpc_resource_quota *resource_quota,
                                        size_t new_size);
 /** Fetch a vtable for a grpc_channel_arg that points to a grpc_resource_quota
 */
 GRPCAPI const grpc_arg_pointer_vtable *grpc_resource_quota_arg_vtable(void);
 #ifdef __cplusplus
 }
 #endif
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@ -201,9 +201,19 @@ typedef struct {
 #define GRPC_ARG_MAX_METADATA_SIZE "grpc.max_metadata_size"
 /** If non-zero, allow the use of SO_REUSEPORT if it's available (default 1) */
 #define GRPC_ARG_ALLOW_REUSEPORT "grpc.so_reuseport"
 /** If non-zero, a pointer to a buffer pool (use grpc_resource_quota_arg_vtable
   to fetch an appropriate pointer arg vtable */
 #define GRPC_ARG_RESOURCE_QUOTA "grpc.resource_quota"
 /** Service config data, to be passed to subchannels.
    Not intended for external use. */
 #define GRPC_ARG_SERVICE_CONFIG "grpc.service_config"
 /** LB policy name. */
 #define GRPC_ARG_LB_POLICY_NAME "grpc.lb_policy_name"
 /** Server name. Not intended for external use. */
 #define GRPC_ARG_SERVER_NAME "grpc.server_name"
 /** Resolved addresses in a form used by the LB policy.
    Not intended for external use. */
 #define GRPC_ARG_LB_ADDRESSES "grpc.lb_addresses"
 /** \} */
 /** Result of a grpc call. If the caller satisfies the prerequisites of a
@ -460,6 +470,8 @@ typedef struct grpc_op {
  } data;
 } grpc_op;
 typedef struct grpc_resource_quota grpc_resource_quota;
 #ifdef __cplusplus
 }
 #endif
--- a/include/grpc/impl/codegen/port_platform.h
+++ b/include/grpc/impl/codegen/port_platform.h
@ -90,7 +90,6 @@
 #endif
 #define GPR_PLATFORM_STRING "windows"
 #define GPR_WINDOWS 1
 #define GPR_WINSOCK_SOCKET 1
 #define GPR_WINDOWS_SUBPROCESS 1
 #define GPR_WINDOWS_ENV
 #ifdef __MSYS__
@ -124,24 +123,14 @@
 #define GPR_GCC_TLS 1
 #define GPR_LINUX 1
 #define GPR_LINUX_LOG 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GPR_POSIX_SOCKETUTILS 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
 #define GPR_HAVE_UNIX_SOCKET 1
 #define GPR_HAVE_IP_PKTINFO 1
 #define GPR_HAVE_IPV6_RECVPKTINFO 1
 #define GPR_LINUX_ENV 1
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_POSIX_STRING 1
 #define GPR_POSIX_SUBPROCESS 1
 #define GPR_POSIX_SYNC 1
 #define GPR_POSIX_TIME 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_HAVE_MSG_NOSIGNAL 1
 #ifdef _LP64
 #define GPR_ARCH_64 1
 #else /* _LP64 */
@ -158,14 +147,7 @@
 #define GPR_CPU_POSIX 1
 #define GPR_GCC_SYNC 1
 #define GPR_GCC_TLS 1
 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_LINUX_EVENTFD 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_POSIX_SOCKETUTILS 1
 #define GPR_POSIX_ENV 1
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_ANDROID_LOG 1
 #define GPR_POSIX_STRING 1
@ -174,10 +156,6 @@
 #define GPR_POSIX_TIME 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
 #define GPR_HAVE_MSG_NOSIGNAL 1
 #define GPR_HAVE_UNIX_SOCKET 1
 #define GPR_HAVE_IP_PKTINFO 1
 #define GPR_HAVE_IPV6_RECVPKTINFO 1
 #elif defined(__linux__)
 #define GPR_POSIX_CRASH_HANDLER 1
 #define GPR_PLATFORM_STRING "linux"
@ -196,38 +174,14 @@
 #define GPR_GCC_TLS 1
 #define GPR_LINUX 1
 #define GPR_LINUX_LOG
 #define GPR_LINUX_MULTIPOLL_WITH_EPOLL 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
 #define GPR_HAVE_UNIX_SOCKET 1
 #define GPR_HAVE_IP_PKTINFO 1
 #define GPR_HAVE_IPV6_RECVPKTINFO 1
 #ifdef __GLIBC_PREREQ
 #if __GLIBC_PREREQ(2, 9)
 #define GPR_LINUX_EVENTFD 1
 #define GPR_LINUX_EPOLL 1
 #endif
 #if __GLIBC_PREREQ(2, 10)
 #define GPR_LINUX_SOCKETUTILS 1
 #endif
 #endif
 #define GPR_LINUX_ENV 1
 #ifndef GPR_LINUX_EVENTFD
 #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #endif
 #ifndef GPR_LINUX_SOCKETUTILS
 #define GPR_POSIX_SOCKETUTILS
 #endif
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_POSIX_STRING 1
 #define GPR_POSIX_SUBPROCESS 1
 #define GPR_POSIX_SYNC 1
 #define GPR_POSIX_TIME 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_HAVE_MSG_NOSIGNAL 1
 #ifdef _LP64
 #define GPR_ARCH_64 1
 #else /* _LP64 */
@ -239,7 +193,6 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
 #define GPR_MSG_IOVLEN_TYPE int
 #if TARGET_OS_IPHONE
 #define GPR_FORBID_UNREACHABLE_CODE 1
 #define GPR_PLATFORM_STRING "ios"
@ -261,16 +214,10 @@
 #endif
 #define GPR_POSIX_CRASH_HANDLER 1
 #endif
 #define GPR_APPLE 1
 #define GPR_GCC_ATOMIC 1
 #define GPR_POSIX_LOG 1
 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_POSIX_SOCKETUTILS 1
 #define GPR_POSIX_ENV 1
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_POSIX_STRING 1
 #define GPR_POSIX_SUBPROCESS 1
@ -278,9 +225,6 @@
 #define GPR_POSIX_TIME 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
 #define GPR_HAVE_SO_NOSIGPIPE 1
 #define GPR_HAVE_UNIX_SOCKET 1
 #define GPR_HAVE_IP_PKTINFO 1
 #ifdef _LP64
 #define GPR_ARCH_64 1
 #else /* _LP64 */
@ -291,18 +235,12 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
 #define GPR_FREEBSD 1
 #define GPR_CPU_POSIX 1
 #define GPR_GCC_ATOMIC 1
 #define GPR_GCC_TLS 1
 #define GPR_POSIX_LOG 1
 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_POSIX_SOCKETUTILS 1
 #define GPR_POSIX_ENV 1
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_POSIX_STRING 1
 #define GPR_POSIX_SUBPROCESS 1
@ -310,10 +248,6 @@
 #define GPR_POSIX_TIME 1
 #define GPR_GETPID_IN_UNISTD_H 1
 #define GPR_SUPPORT_CHANNELS_FROM_FD 1
 #define GPR_HAVE_SO_NOSIGPIPE 1
 #define GPR_HAVE_UNIX_SOCKET 1
 #define GPR_HAVE_IP_PKTINFO 1
 #define GPR_HAVE_IPV6_RECVPKTINFO 1
 #ifdef _LP64
 #define GPR_ARCH_64 1
 #else /* _LP64 */
@ -330,18 +264,12 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 #define GPR_NACL 1
 #define GPR_CPU_POSIX 1
 #define GPR_GCC_ATOMIC 1
 #define GPR_GCC_TLS 1
 #define GPR_POSIX_LOG 1
 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1
 #define GPR_POSIX_WAKEUP_FD 1
 #define GPR_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GPR_POSIX_SOCKET 1
 #define GPR_POSIX_SOCKETADDR 1
 #define GPR_POSIX_SOCKETUTILS 1
 #define GPR_POSIX_ENV 1
 #define GPR_POSIX_FILE 1
 #define GPR_POSIX_TMPFILE 1
 #define GPR_POSIX_STRING 1
 #define GPR_POSIX_SUBPROCESS 1
@ -422,16 +350,6 @@ typedef unsigned __int64 uint64_t;
 #error Must define exactly one of GPR_CPU_LINUX, GPR_CPU_POSIX, GPR_WINDOWS, GPR_CPU_IPHONE, GPR_CPU_CUSTOM
 #endif
 #if defined(GPR_POSIX_MULTIPOLL_WITH_POLL) && !defined(GPR_POSIX_SOCKET)
 #error Must define GPR_POSIX_SOCKET to use GPR_POSIX_MULTIPOLL_WITH_POLL
 #endif
 #if defined(GPR_POSIX_SOCKET) + defined(GPR_WINSOCK_SOCKET) + \
        defined(GPR_CUSTOM_SOCKET) !=                         \
    1
 #error Must define exactly one of GPR_POSIX_SOCKET, GPR_WINSOCK_SOCKET, GPR_CUSTOM_SOCKET
 #endif
 #if defined(GPR_MSVC_TLS) + defined(GPR_GCC_TLS) + defined(GPR_PTHREAD_TLS) + \
        defined(GPR_CUSTOM_TLS) !=                                            \
    1
--- a/package.json
+++ b/package.json
@ -25,24 +25,28 @@
    "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha src/node/test",
    "install": "./node_modules/.bin/node-pre-gyp install --fallback-to-build"
  },
-  "bundledDependencies": ["node-pre-gyp"],
+  "bundledDependencies": [
    "node-pre-gyp"
  ],
  "dependencies": {
    "arguejs": "^0.2.3",
-    "lodash": "^3.9.3",
+    "lodash": "^4.15.0",
    "nan": "^2.0.0",
-    "protobufjs": "^4.0.0"
+    "node-pre-gyp": "^0.6.0",
    "protobufjs": "^5.0.0"
  },
  "devDependencies": {
-    "async": "^1.5.0",
+    "async": "^2.0.1",
    "body-parser": "^1.15.2",
    "express": "^4.14.0",
    "google-auth-library": "^0.9.2",
    "google-protobuf": "^3.0.0",
-    "istanbul": "^0.3.21",
+    "istanbul": "^0.4.4",
    "jsdoc": "^3.3.2",
    "jshint": "^2.5.0",
    "minimist": "^1.1.0",
-    "mocha": "^2.3.4",
+    "mocha": "^3.0.2",
-    "mocha-jenkins-reporter": "^0.1.9",
+    "mocha-jenkins-reporter": "^0.2.3",
    "mustache": "^2.0.0",
    "poisson-process": "^0.2.1"
  },
  "engines": {
@ -50,11 +54,10 @@
  },
  "binary": {
    "module_name": "grpc_node",
-    "module_path": "./build/Release/",
+    "module_path": "src/node/extension_binary",
    "host": "https://storage.googleapis.com/",
    "remote_path": "grpc-precompiled-binaries/node/{name}/v{version}",
-    "package_name": "{node_abi}-{platform}-{arch}.tar.gz",
+    "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
    "module_path": "src/node/extension_binary"
  },
  "files": [
    "LICENSE",
@ -75,7 +78,7 @@
  ],
  "main": "src/node/index.js",
  "license": "BSD-3-Clause",
-  "jshintConfig" : {
+  "jshintConfig": {
    "bitwise": true,
    "curly": true,
    "eqeqeq": true,
--- a/package.xml
+++ b/package.xml
@ -214,27 +214,36 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_uv.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/port.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resource_quota.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_utils.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_uv.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/time_averaged_stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_generic.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_heap.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_uv.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/udp_server.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_cv.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_uv.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_windows.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_common.h" role="src" />
@ -256,6 +265,7 @@
    <file baseinstalldir="/" name="src/core/lib/transport/mdstr_hash_table.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/metadata_batch.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/method_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/static_metadata.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport.h" role="src" />
@ -313,12 +323,10 @@
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/method_config.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/parse_address.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_factory.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_registry.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_result.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/uri_parser.h" role="src" />
@ -363,6 +371,7 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/combiner.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/endpoint_pair_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/error.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/ev_epoll_linux.c" role="src" />
@ -374,28 +383,39 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/iocp_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/iomgr.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/iomgr_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/load_file.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/network_status_tracker.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/polling_entity.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_set_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/pollset_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resolve_address_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/resource_quota.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/sockaddr_utils.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_common_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_linux.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_utils_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/socket_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_client_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_server_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/tcp_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/time_averaged_stats.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/iomgr/timer.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_generic.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_heap.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/timer_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/udp_server.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/unix_sockets_posix_noop.c" role="src" />
@ -404,6 +424,7 @@
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_nospecial.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_pipe.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/wakeup_fd_posix.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_uv.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/iomgr/workqueue_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/json/json_reader.c" role="src" />
@ -432,6 +453,7 @@
    <file baseinstalldir="/" name="src/core/lib/transport/mdstr_hash_table.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/metadata.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/metadata_batch.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/method_config.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/static_metadata.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/timeout_encoding.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/transport/transport.c" role="src" />
@ -465,8 +487,7 @@
    <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/credentials_metadata.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/fake/fake_credentials.c" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_posix.c" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_generic.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/credentials_windows.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/google_default/google_default_credentials.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/iam/iam_credentials.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/credentials/jwt/json_token.c" role="src" />
@ -499,12 +520,10 @@
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/lb_policy_registry.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/method_config.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/parse_address.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_factory.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_registry.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/resolver_result.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/subchannel_index.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/client_channel/uri_parser.c" role="src" />
--- a/setup.py
+++ b/setup.py
@ -79,6 +79,11 @@ BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
 ENABLE_CYTHON_TRACING = os.environ.get(
    'GRPC_PYTHON_ENABLE_CYTHON_TRACING', False)
 # Environment variable specifying whether or not there's interest in setting up
 # documentation building.
 ENABLE_DOCUMENTATION_BUILD = os.environ.get(
    'GRPC_PYTHON_ENABLE_DOCUMENTATION_BUILD', False)
 # There are some situations (like on Windows) where CC, CFLAGS, and LDFLAGS are
 # entirely ignored/dropped/forgotten by distutils and its Cygwin/MinGW support.
 # We use these environment variables to thus get around that without locking
@ -210,7 +215,8 @@ SETUP_REQUIRES = INSTALL_REQUIRES + (
    'sphinx>=1.3',
    'sphinx_rtd_theme>=0.1.8',
    'six>=1.10',
-)
+  ) if ENABLE_DOCUMENTATION_BUILD else ()
 if BUILD_WITH_CYTHON:
  sys.stderr.write(
    "You requested a Cython build via GRPC_PYTHON_BUILD_WITH_CYTHON, "
--- a/src/boringssl/gen_build_yaml.py
+++ b/src/boringssl/gen_build_yaml.py
@ -36,7 +36,7 @@ import yaml
 sys.dont_write_bytecode = True
 boring_ssl_root = os.path.abspath(os.path.join(
-    os.path.dirname(sys.argv[0]), 
+    os.path.dirname(sys.argv[0]),
    '../../third_party/boringssl'))
 sys.path.append(os.path.join(boring_ssl_root, 'util'))
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@ -35,6 +35,8 @@
 #include <cassert>
 #include <cctype>
 #include <cstring>
 #include <fstream>
 #include <iostream>
 #include <map>
 #include <memory>
 #include <ostream>
@ -66,66 +68,11 @@ using std::vector;
 namespace grpc_python_generator {
 GeneratorConfiguration::GeneratorConfiguration()
    : grpc_package_root("grpc"), beta_package_root("grpc.beta") {}
 PythonGrpcGenerator::PythonGrpcGenerator(const GeneratorConfiguration& config)
    : config_(config) {}
 PythonGrpcGenerator::~PythonGrpcGenerator() {}
 bool PythonGrpcGenerator::Generate(const FileDescriptor* file,
                                   const grpc::string& parameter,
                                   GeneratorContext* context,
                                   grpc::string* error) const {
  // Get output file name.
  grpc::string file_name;
  static const int proto_suffix_length = strlen(".proto");
  if (file->name().size() > static_cast<size_t>(proto_suffix_length) &&
      file->name().find_last_of(".proto") == file->name().size() - 1) {
    file_name =
        file->name().substr(0, file->name().size() - proto_suffix_length) +
        "_pb2.py";
  } else {
    *error = "Invalid proto file name. Proto file must end with .proto";
    return false;
  }
  std::unique_ptr<ZeroCopyOutputStream> output(
      context->OpenForInsert(file_name, "module_scope"));
  CodedOutputStream coded_out(output.get());
  bool success = false;
  grpc::string code = "";
  tie(success, code) = grpc_python_generator::GetServices(file, config_);
  if (success) {
    coded_out.WriteRaw(code.data(), code.size());
    return true;
  } else {
    return false;
  }
 }
 namespace {
-//////////////////////////////////
+
-// BEGIN FORMATTING BOILERPLATE //
+typedef vector<const Descriptor*> DescriptorVector;
-//////////////////////////////////
+typedef map<grpc::string, grpc::string> StringMap;
-
+typedef vector<grpc::string> StringVector;
 // Converts an initializer list of the form { key0, value0, key1, value1, ... }
 // into a map of key* to value*. Is merely a readability helper for later code.
 map<grpc::string, grpc::string> ListToDict(
    const initializer_list<grpc::string>& values) {
  assert(values.size() % 2 == 0);
  map<grpc::string, grpc::string> value_map;
  auto value_iter = values.begin();
  for (unsigned i = 0; i < values.size() / 2; ++i) {
    grpc::string key = *value_iter;
    ++value_iter;
    grpc::string value = *value_iter;
    value_map[key] = value;
    ++value_iter;
  }
  return value_map;
 }
 // Provides RAII indentation handling. Use as:
 // {
@ -146,10 +93,6 @@ class IndentScope {
  Printer* printer_;
 };
 ////////////////////////////////
 // END FORMATTING BOILERPLATE //
 ////////////////////////////////
 // TODO(https://github.com/google/protobuf/issues/888):
 // Export `ModuleName` from protobuf's
 // `src/google/protobuf/compiler/python/python_generator.cc` file.
@ -173,11 +116,61 @@ grpc::string ModuleAlias(const grpc::string& filename) {
  return module_name;
 }
-bool GetModuleAndMessagePath(const Descriptor* type,
+// Tucks all generator state in an anonymous namespace away from
-                             const ServiceDescriptor* service,
+// PythonGrpcGenerator and the header file, mostly to encourage future changes
-                             grpc::string* out) {
+// to not require updates to the grpcio-tools C++ code part. Assumes that it is
 // only ever used from a single thread.
 struct PrivateGenerator {
  const GeneratorConfiguration& config;
  const FileDescriptor* file;
  bool generate_in_pb2_grpc;
  Printer* out;
  PrivateGenerator(const GeneratorConfiguration& config,
                   const FileDescriptor* file);
  std::pair<bool, grpc::string> GetGrpcServices();
 private:
  bool PrintPreamble();
  bool PrintBetaPreamble();
  bool PrintGAServices();
  bool PrintBetaServices();
  bool PrintAddServicerToServer(
      const grpc::string& package_qualified_service_name,
      const ServiceDescriptor* service);
  bool PrintServicer(const ServiceDescriptor* service);
  bool PrintStub(const grpc::string& package_qualified_service_name,
                 const ServiceDescriptor* service);
  bool PrintBetaServicer(const ServiceDescriptor* service);
  bool PrintBetaServerFactory(
      const grpc::string& package_qualified_service_name,
      const ServiceDescriptor* service);
  bool PrintBetaStub(const ServiceDescriptor* service);
  bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
                            const ServiceDescriptor* service);
  // Get all comments (leading, leading_detached, trailing) and print them as a
  // docstring. Any leading space of a line will be removed, but the line
  // wrapping will not be changed.
  template <typename DescriptorType>
  void PrintAllComments(const DescriptorType* descriptor);
  bool GetModuleAndMessagePath(const Descriptor* type, grpc::string* out);
 };
 PrivateGenerator::PrivateGenerator(const GeneratorConfiguration& config,
                                   const FileDescriptor* file)
    : config(config), file(file) {}
 bool PrivateGenerator::GetModuleAndMessagePath(const Descriptor* type,
                                               grpc::string* out) {
  const Descriptor* path_elem_type = type;
-  vector<const Descriptor*> message_path;
+  DescriptorVector message_path;
  do {
    message_path.push_back(path_elem_type);
    path_elem_type = path_elem_type->containing_type();
@ -188,12 +181,16 @@ bool GetModuleAndMessagePath(const Descriptor* type,
        file_name.find_last_of(".proto") == file_name.size() - 1)) {
    return false;
  }
-  grpc::string service_file_name = service->file()->name();
+  grpc::string generator_file_name = file->name();
-  grpc::string module =
+  grpc::string module;
-      service_file_name == file_name ? "" : ModuleAlias(file_name) + ".";
+  if (generator_file_name != file_name || generate_in_pb2_grpc) {
    module = ModuleAlias(file_name) + ".";
  } else {
    module = "";
  }
  grpc::string message_type;
-  for (auto path_iter = message_path.rbegin(); path_iter != message_path.rend();
+  for (DescriptorVector::reverse_iterator path_iter = message_path.rbegin();
-       ++path_iter) {
+       path_iter != message_path.rend(); ++path_iter) {
    message_type += (*path_iter)->name() + ".";
  }
  // no pop_back prior to C++11
@ -202,33 +199,31 @@ bool GetModuleAndMessagePath(const Descriptor* type,
  return true;
 }
 // Get all comments (leading, leading_detached, trailing) and print them as a
 // docstring. Any leading space of a line will be removed, but the line wrapping
 // will not be changed.
 template <typename DescriptorType>
-static void PrintAllComments(const DescriptorType* desc, Printer* printer) {
+void PrivateGenerator::PrintAllComments(const DescriptorType* descriptor) {
-  std::vector<grpc::string> comments;
+  StringVector comments;
-  grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_LEADING_DETACHED,
+  grpc_generator::GetComment(
-                             &comments);
+      descriptor, grpc_generator::COMMENTTYPE_LEADING_DETACHED, &comments);
-  grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_LEADING,
+  grpc_generator::GetComment(descriptor, grpc_generator::COMMENTTYPE_LEADING,
                             &comments);
-  grpc_generator::GetComment(desc, grpc_generator::COMMENTTYPE_TRAILING,
+  grpc_generator::GetComment(descriptor, grpc_generator::COMMENTTYPE_TRAILING,
                             &comments);
  if (comments.empty()) {
    return;
  }
-  printer->Print("\"\"\"");
+  out->Print("\"\"\"");
-  for (auto it = comments.begin(); it != comments.end(); ++it) {
+  for (StringVector::iterator it = comments.begin(); it != comments.end();
       ++it) {
    size_t start_pos = it->find_first_not_of(' ');
    if (start_pos != grpc::string::npos) {
-      printer->Print(it->c_str() + start_pos);
+      out->Print(it->c_str() + start_pos);
    }
-    printer->Print("\n");
+    out->Print("\n");
  }
-  printer->Print("\"\"\"\n");
+  out->Print("\"\"\"\n");
 }
-bool PrintBetaServicer(const ServiceDescriptor* service, Printer* out) {
+bool PrivateGenerator::PrintBetaServicer(const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print("class Beta$Service$Servicer(object):\n", "Service",
             service->name());
@ -241,16 +236,16 @@ bool PrintBetaServicer(const ServiceDescriptor* service, Printer* out) {
        "generated\n"
        "only to ease transition from grpcio<0.15.0 to "
        "grpcio>=0.15.0.\"\"\"\n");
-    PrintAllComments(service, out);
+    PrintAllComments(service);
    for (int i = 0; i < service->method_count(); ++i) {
-      auto meth = service->method(i);
+      const MethodDescriptor* method = service->method(i);
      grpc::string arg_name =
-          meth->client_streaming() ? "request_iterator" : "request";
+          method->client_streaming() ? "request_iterator" : "request";
      out->Print("def $Method$(self, $ArgName$, context):\n", "Method",
-                 meth->name(), "ArgName", arg_name);
+                 method->name(), "ArgName", arg_name);
      {
        IndentScope raii_method_indent(out);
-        PrintAllComments(meth, out);
+        PrintAllComments(method);
        out->Print("context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)\n");
      }
    }
@ -258,7 +253,7 @@ bool PrintBetaServicer(const ServiceDescriptor* service, Printer* out) {
  return true;
 }
-bool PrintBetaStub(const ServiceDescriptor* service, Printer* out) {
+bool PrivateGenerator::PrintBetaStub(const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print("class Beta$Service$Stub(object):\n", "Service", service->name());
  {
@ -270,30 +265,33 @@ bool PrintBetaStub(const ServiceDescriptor* service, Printer* out) {
        "generated\n"
        "only to ease transition from grpcio<0.15.0 to "
        "grpcio>=0.15.0.\"\"\"\n");
-    PrintAllComments(service, out);
+    PrintAllComments(service);
    for (int i = 0; i < service->method_count(); ++i) {
-      const MethodDescriptor* meth = service->method(i);
+      const MethodDescriptor* method = service->method(i);
      grpc::string arg_name =
-          meth->client_streaming() ? "request_iterator" : "request";
+          method->client_streaming() ? "request_iterator" : "request";
-      auto methdict = ListToDict({"Method", meth->name(), "ArgName", arg_name});
+      StringMap method_dict;
-      out->Print(methdict,
+      method_dict["Method"] = method->name();
      method_dict["ArgName"] = arg_name;
      out->Print(method_dict,
                 "def $Method$(self, $ArgName$, timeout, metadata=None, "
                 "with_call=False, protocol_options=None):\n");
      {
        IndentScope raii_method_indent(out);
-        PrintAllComments(meth, out);
+        PrintAllComments(method);
        out->Print("raise NotImplementedError()\n");
      }
-      if (!meth->server_streaming()) {
+      if (!method->server_streaming()) {
-        out->Print(methdict, "$Method$.future = None\n");
+        out->Print(method_dict, "$Method$.future = None\n");
      }
    }
  }
  return true;
 }
-bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
+bool PrivateGenerator::PrintBetaServerFactory(
-                            const ServiceDescriptor* service, Printer* out) {
+    const grpc::string& package_qualified_service_name,
    const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print(
      "def beta_create_$Service$_server(servicer, pool=None, "
@ -307,9 +305,9 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
        "file not marked beta) for all further purposes. This function was\n"
        "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"
        "\"\"\"\n");
-    map<grpc::string, grpc::string> method_implementation_constructors;
+    StringMap method_implementation_constructors;
-    map<grpc::string, grpc::string> input_message_modules_and_classes;
+    StringMap input_message_modules_and_classes;
-    map<grpc::string, grpc::string> output_message_modules_and_classes;
+    StringMap output_message_modules_and_classes;
    for (int i = 0; i < service->method_count(); ++i) {
      const MethodDescriptor* method = service->method(i);
      const grpc::string method_implementation_constructor =
@ -317,12 +315,12 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
          grpc::string(method->server_streaming() ? "stream_" : "unary_") +
          "inline";
      grpc::string input_message_module_and_class;
-      if (!GetModuleAndMessagePath(method->input_type(), service,
+      if (!GetModuleAndMessagePath(method->input_type(),
                                   &input_message_module_and_class)) {
        return false;
      }
      grpc::string output_message_module_and_class;
-      if (!GetModuleAndMessagePath(method->output_type(), service,
+      if (!GetModuleAndMessagePath(method->output_type(),
                                   &output_message_module_and_class)) {
        return false;
      }
@ -334,7 +332,7 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
          make_pair(method->name(), output_message_module_and_class));
    }
    out->Print("request_deserializers = {\n");
-    for (auto name_and_input_module_class_pair =
+    for (StringMap::iterator name_and_input_module_class_pair =
             input_message_modules_and_classes.begin();
         name_and_input_module_class_pair !=
         input_message_modules_and_classes.end();
@ -349,7 +347,7 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
    }
    out->Print("}\n");
    out->Print("response_serializers = {\n");
-    for (auto name_and_output_module_class_pair =
+    for (StringMap::iterator name_and_output_module_class_pair =
             output_message_modules_and_classes.begin();
         name_and_output_module_class_pair !=
         output_message_modules_and_classes.end();
@ -365,7 +363,7 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
    }
    out->Print("}\n");
    out->Print("method_implementations = {\n");
-    for (auto name_and_implementation_constructor =
+    for (StringMap::iterator name_and_implementation_constructor =
             method_implementation_constructors.begin();
         name_and_implementation_constructor !=
         method_implementation_constructors.end();
@ -395,11 +393,11 @@ bool PrintBetaServerFactory(const grpc::string& package_qualified_service_name,
  return true;
 }
-bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
+bool PrivateGenerator::PrintBetaStubFactory(
-                          const ServiceDescriptor* service, Printer* out) {
+    const grpc::string& package_qualified_service_name,
-  map<grpc::string, grpc::string> dict = ListToDict({
+    const ServiceDescriptor* service) {
-      "Service", service->name(),
+  StringMap dict;
-  });
+  dict["Service"] = service->name();
  out->Print("\n\n");
  out->Print(dict,
             "def beta_create_$Service$_stub(channel, host=None,"
@ -412,21 +410,21 @@ bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
        "file not marked beta) for all further purposes. This function was\n"
        "generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"
        "\"\"\"\n");
-    map<grpc::string, grpc::string> method_cardinalities;
+    StringMap method_cardinalities;
-    map<grpc::string, grpc::string> input_message_modules_and_classes;
+    StringMap input_message_modules_and_classes;
-    map<grpc::string, grpc::string> output_message_modules_and_classes;
+    StringMap output_message_modules_and_classes;
    for (int i = 0; i < service->method_count(); ++i) {
      const MethodDescriptor* method = service->method(i);
      const grpc::string method_cardinality =
          grpc::string(method->client_streaming() ? "STREAM" : "UNARY") + "_" +
          grpc::string(method->server_streaming() ? "STREAM" : "UNARY");
      grpc::string input_message_module_and_class;
-      if (!GetModuleAndMessagePath(method->input_type(), service,
+      if (!GetModuleAndMessagePath(method->input_type(),
                                   &input_message_module_and_class)) {
        return false;
      }
      grpc::string output_message_module_and_class;
-      if (!GetModuleAndMessagePath(method->output_type(), service,
+      if (!GetModuleAndMessagePath(method->output_type(),
                                   &output_message_module_and_class)) {
        return false;
      }
@ -438,7 +436,7 @@ bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
          make_pair(method->name(), output_message_module_and_class));
    }
    out->Print("request_serializers = {\n");
-    for (auto name_and_input_module_class_pair =
+    for (StringMap::iterator name_and_input_module_class_pair =
             input_message_modules_and_classes.begin();
         name_and_input_module_class_pair !=
         input_message_modules_and_classes.end();
@ -453,7 +451,7 @@ bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
    }
    out->Print("}\n");
    out->Print("response_deserializers = {\n");
-    for (auto name_and_output_module_class_pair =
+    for (StringMap::iterator name_and_output_module_class_pair =
             output_message_modules_and_classes.begin();
         name_and_output_module_class_pair !=
         output_message_modules_and_classes.end();
@ -469,7 +467,8 @@ bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
    }
    out->Print("}\n");
    out->Print("cardinalities = {\n");
-    for (auto name_and_cardinality = method_cardinalities.begin();
+    for (StringMap::iterator name_and_cardinality =
             method_cardinalities.begin();
         name_and_cardinality != method_cardinalities.end();
         name_and_cardinality++) {
      IndentScope raii_descriptions_indent(out);
@ -493,13 +492,14 @@ bool PrintBetaStubFactory(const grpc::string& package_qualified_service_name,
  return true;
 }
-bool PrintStub(const grpc::string& package_qualified_service_name,
+bool PrivateGenerator::PrintStub(
-               const ServiceDescriptor* service, Printer* out) {
+    const grpc::string& package_qualified_service_name,
    const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print("class $Service$Stub(object):\n", "Service", service->name());
  {
    IndentScope raii_class_indent(out);
-    PrintAllComments(service, out);
+    PrintAllComments(service);
    out->Print("\n");
    out->Print("def __init__(self, channel):\n");
    {
@ -513,17 +513,17 @@ bool PrintStub(const grpc::string& package_qualified_service_name,
      }
      out->Print("\"\"\"\n");
      for (int i = 0; i < service->method_count(); ++i) {
-        auto method = service->method(i);
+        const MethodDescriptor* method = service->method(i);
-        auto multi_callable_constructor =
+        grpc::string multi_callable_constructor =
            grpc::string(method->client_streaming() ? "stream" : "unary") +
            "_" + grpc::string(method->server_streaming() ? "stream" : "unary");
        grpc::string request_module_and_class;
-        if (!GetModuleAndMessagePath(method->input_type(), service,
+        if (!GetModuleAndMessagePath(method->input_type(),
                                     &request_module_and_class)) {
          return false;
        }
        grpc::string response_module_and_class;
-        if (!GetModuleAndMessagePath(method->output_type(), service,
+        if (!GetModuleAndMessagePath(method->output_type(),
                                     &response_module_and_class)) {
          return false;
        }
@ -550,14 +550,14 @@ bool PrintStub(const grpc::string& package_qualified_service_name,
  return true;
 }
-bool PrintServicer(const ServiceDescriptor* service, Printer* out) {
+bool PrivateGenerator::PrintServicer(const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print("class $Service$Servicer(object):\n", "Service", service->name());
  {
    IndentScope raii_class_indent(out);
-    PrintAllComments(service, out);
+    PrintAllComments(service);
    for (int i = 0; i < service->method_count(); ++i) {
-      auto method = service->method(i);
+      const MethodDescriptor* method = service->method(i);
      grpc::string arg_name =
          method->client_streaming() ? "request_iterator" : "request";
      out->Print("\n");
@ -565,7 +565,7 @@ bool PrintServicer(const ServiceDescriptor* service, Printer* out) {
                 method->name(), "ArgName", arg_name);
      {
        IndentScope raii_method_indent(out);
-        PrintAllComments(method, out);
+        PrintAllComments(method);
        out->Print("context.set_code(grpc.StatusCode.UNIMPLEMENTED)\n");
        out->Print("context.set_details('Method not implemented!')\n");
        out->Print("raise NotImplementedError('Method not implemented!')\n");
@ -575,9 +575,9 @@ bool PrintServicer(const ServiceDescriptor* service, Printer* out) {
  return true;
 }
-bool PrintAddServicerToServer(
+bool PrivateGenerator::PrintAddServicerToServer(
    const grpc::string& package_qualified_service_name,
-    const ServiceDescriptor* service, Printer* out) {
+    const ServiceDescriptor* service) {
  out->Print("\n\n");
  out->Print("def add_$Service$Servicer_to_server(servicer, server):\n",
             "Service", service->name());
@ -588,19 +588,19 @@ bool PrintAddServicerToServer(
      IndentScope raii_dict_first_indent(out);
      IndentScope raii_dict_second_indent(out);
      for (int i = 0; i < service->method_count(); ++i) {
-        auto method = service->method(i);
+        const MethodDescriptor* method = service->method(i);
-        auto method_handler_constructor =
+        grpc::string method_handler_constructor =
            grpc::string(method->client_streaming() ? "stream" : "unary") +
            "_" +
            grpc::string(method->server_streaming() ? "stream" : "unary") +
            "_rpc_method_handler";
        grpc::string request_module_and_class;
-        if (!GetModuleAndMessagePath(method->input_type(), service,
+        if (!GetModuleAndMessagePath(method->input_type(),
                                     &request_module_and_class)) {
          return false;
        }
        grpc::string response_module_and_class;
-        if (!GetModuleAndMessagePath(method->output_type(), service,
+        if (!GetModuleAndMessagePath(method->output_type(),
                                     &response_module_and_class)) {
          return false;
        }
@ -635,53 +635,173 @@ bool PrintAddServicerToServer(
  return true;
 }
-bool PrintPreamble(const FileDescriptor* file,
+bool PrivateGenerator::PrintBetaPreamble() {
                   const GeneratorConfiguration& config, Printer* out) {
  out->Print("import $Package$\n", "Package", config.grpc_package_root);
  out->Print("from $Package$ import implementations as beta_implementations\n",
             "Package", config.beta_package_root);
  out->Print("from $Package$ import interfaces as beta_interfaces\n", "Package",
             config.beta_package_root);
  return true;
 }
 bool PrivateGenerator::PrintPreamble() {
  out->Print("import $Package$\n", "Package", config.grpc_package_root);
  out->Print("from grpc.framework.common import cardinality\n");
  out->Print(
      "from grpc.framework.interfaces.face import utilities as "
      "face_utilities\n");
  if (generate_in_pb2_grpc) {
    out->Print("\n");
    for (int i = 0; i < file->service_count(); ++i) {
      const ServiceDescriptor* service = file->service(i);
      for (int j = 0; j < service->method_count(); ++j) {
        const MethodDescriptor* method = service->method(j);
        const Descriptor* types[2] = {method->input_type(),
                                      method->output_type()};
        for (int k = 0; k < 2; ++k) {
          const Descriptor* type = types[k];
          grpc::string type_file_name = type->file()->name();
          grpc::string module_name = ModuleName(type_file_name);
          grpc::string module_alias = ModuleAlias(type_file_name);
          out->Print("import $ModuleName$ as $ModuleAlias$\n", "ModuleName",
                     module_name, "ModuleAlias", module_alias);
        }
      }
    }
  }
  return true;
 }
-}  // namespace
+bool PrivateGenerator::PrintGAServices() {
  grpc::string package = file->package();
  if (!package.empty()) {
    package = package.append(".");
  }
  for (int i = 0; i < file->service_count(); ++i) {
    const ServiceDescriptor* service = file->service(i);
    grpc::string package_qualified_service_name = package + service->name();
    if (!(PrintStub(package_qualified_service_name, service) &&
          PrintServicer(service) &&
          PrintAddServicerToServer(package_qualified_service_name, service))) {
      return false;
    }
  }
  return true;
 }
-pair<bool, grpc::string> GetServices(const FileDescriptor* file,
+bool PrivateGenerator::PrintBetaServices() {
-                                     const GeneratorConfiguration& config) {
+  grpc::string package = file->package();
  if (!package.empty()) {
    package = package.append(".");
  }
  for (int i = 0; i < file->service_count(); ++i) {
    const ServiceDescriptor* service = file->service(i);
    grpc::string package_qualified_service_name = package + service->name();
    if (!(PrintBetaServicer(service) && PrintBetaStub(service) &&
          PrintBetaServerFactory(package_qualified_service_name, service) &&
          PrintBetaStubFactory(package_qualified_service_name, service))) {
      return false;
    }
  }
  return true;
 }
 pair<bool, grpc::string> PrivateGenerator::GetGrpcServices() {
  grpc::string output;
  {
    // Scope the output stream so it closes and finalizes output to the string.
    StringOutputStream output_stream(&output);
-    Printer out(&output_stream, '$');
+    Printer out_printer(&output_stream, '$');
-    if (!PrintPreamble(file, config, &out)) {
+    out = &out_printer;
-      return make_pair(false, "");
+
-    }
+    if (generate_in_pb2_grpc) {
-    auto package = file->package();
+      if (!PrintPreamble()) {
-    if (!package.empty()) {
+        return make_pair(false, "");
-      package = package.append(".");
+      }
-    }
+      if (!PrintGAServices()) {
    for (int i = 0; i < file->service_count(); ++i) {
      auto service = file->service(i);
      auto package_qualified_service_name = package + service->name();
      if (!(PrintStub(package_qualified_service_name, service, &out) &&
            PrintServicer(service, &out) &&
            PrintAddServicerToServer(package_qualified_service_name, service,
                                     &out) &&
            PrintBetaServicer(service, &out) && PrintBetaStub(service, &out) &&
            PrintBetaServerFactory(package_qualified_service_name, service,
                                   &out) &&
            PrintBetaStubFactory(package_qualified_service_name, service,
                                 &out))) {
        return make_pair(false, "");
      }
    } else {
      out->Print("try:\n");
      {
        IndentScope raii_dict_try_indent(out);
        out->Print(
            "# THESE ELEMENTS WILL BE DEPRECATED.\n"
            "# Please use the generated *_pb2_grpc.py files instead.\n");
        if (!PrintPreamble()) {
          return make_pair(false, "");
        }
        if (!PrintBetaPreamble()) {
          return make_pair(false, "");
        }
        if (!PrintGAServices()) {
          return make_pair(false, "");
        }
        if (!PrintBetaServices()) {
          return make_pair(false, "");
        }
      }
      out->Print("except ImportError:\n");
      {
        IndentScope raii_dict_except_indent(out);
        out->Print("pass");
      }
    }
  }
  return make_pair(true, std::move(output));
 }
 }  // namespace
 GeneratorConfiguration::GeneratorConfiguration()
    : grpc_package_root("grpc"), beta_package_root("grpc.beta") {}
 PythonGrpcGenerator::PythonGrpcGenerator(const GeneratorConfiguration& config)
    : config_(config) {}
 PythonGrpcGenerator::~PythonGrpcGenerator() {}
 bool PythonGrpcGenerator::Generate(const FileDescriptor* file,
                                   const grpc::string& parameter,
                                   GeneratorContext* context,
                                   grpc::string* error) const {
  // Get output file name.
  grpc::string pb2_file_name;
  grpc::string pb2_grpc_file_name;
  static const int proto_suffix_length = strlen(".proto");
  if (file->name().size() > static_cast<size_t>(proto_suffix_length) &&
      file->name().find_last_of(".proto") == file->name().size() - 1) {
    grpc::string base =
        file->name().substr(0, file->name().size() - proto_suffix_length);
    pb2_file_name = base + "_pb2.py";
    pb2_grpc_file_name = base + "_pb2_grpc.py";
  } else {
    *error = "Invalid proto file name. Proto file must end with .proto";
    return false;
  }
  PrivateGenerator generator(config_, file);
  std::unique_ptr<ZeroCopyOutputStream> pb2_output(
      context->OpenForAppend(pb2_file_name));
  std::unique_ptr<ZeroCopyOutputStream> grpc_output(
      context->Open(pb2_grpc_file_name));
  CodedOutputStream pb2_coded_out(pb2_output.get());
  CodedOutputStream grpc_coded_out(grpc_output.get());
  bool success = false;
  grpc::string pb2_code;
  grpc::string grpc_code;
  generator.generate_in_pb2_grpc = false;
  tie(success, pb2_code) = generator.GetGrpcServices();
  if (success) {
    generator.generate_in_pb2_grpc = true;
    tie(success, grpc_code) = generator.GetGrpcServices();
    if (success) {
      pb2_coded_out.WriteRaw(pb2_code.data(), pb2_code.size());
      grpc_coded_out.WriteRaw(grpc_code.data(), grpc_code.size());
      return true;
    }
  }
  return false;
 }
 }  // namespace grpc_python_generator
--- a/src/compiler/python_generator.h
+++ b/src/compiler/python_generator.h
@ -62,10 +62,6 @@ class PythonGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
  GeneratorConfiguration config_;
 };
 std::pair<bool, grpc::string> GetServices(
    const grpc::protobuf::FileDescriptor* file,
    const GeneratorConfiguration& config);
 }  // namespace grpc_python_generator
 #endif  // GRPC_INTERNAL_COMPILER_PYTHON_GENERATOR_H
--- a/src/compiler/ruby_generator.cc
+++ b/src/compiler/ruby_generator.cc
@ -119,6 +119,43 @@ void PrintService(const ServiceDescriptor *service, const grpc::string &package,
 }  // namespace
 // The following functions are copied directly from the source for the protoc
 // ruby generator
 // to ensure compatibility (with the exception of int and string type changes).
 // See
 // https://github.com/google/protobuf/blob/master/src/google/protobuf/compiler/ruby/ruby_generator.cc#L250
 // TODO: keep up to date with protoc code generation, though this behavior isn't
 // expected to change
 bool IsLower(char ch) { return ch >= 'a' && ch <= 'z'; }
 char ToUpper(char ch) { return IsLower(ch) ? (ch - 'a' + 'A') : ch; }
 // Package names in protobuf are snake_case by convention, but Ruby module
 // names must be PascalCased.
 //
 //   foo_bar_baz -> FooBarBaz
 grpc::string PackageToModule(const grpc::string &name) {
  bool next_upper = true;
  grpc::string result;
  result.reserve(name.size());
  for (grpc::string::size_type i = 0; i < name.size(); i++) {
    if (name[i] == '_') {
      next_upper = true;
    } else {
      if (next_upper) {
        result.push_back(ToUpper(name[i]));
      } else {
        result.push_back(name[i]);
      }
      next_upper = false;
    }
  }
  return result;
 }
 // end copying of protoc generator for ruby code
 grpc::string GetServices(const FileDescriptor *file) {
  grpc::string output;
  {
@ -162,7 +199,7 @@ grpc::string GetServices(const FileDescriptor *file) {
    std::vector<grpc::string> modules = Split(file->package(), '.');
    for (size_t i = 0; i < modules.size(); ++i) {
      std::map<grpc::string, grpc::string> module_vars = ListToDict({
-          "module.name", CapitalizeFirst(modules[i]),
+          "module.name", PackageToModule(modules[i]),
      });
      out.Print(module_vars, "module $module.name$\n");
      out.Indent();
--- a/src/core/ext/client_channel/README.md
+++ b/src/core/ext/client_channel/README.md
@ -5,28 +5,27 @@ This library provides high level configuration machinery to construct client
 channels and load balance between them.
 Each grpc_channel is created with a grpc_resolver. It is the resolver's duty
-to resolve a name into configuration data for the channel. Such configuration
+to resolve a name into a set of arguments for the channel. Such arguments
-data might include:
+might include:
 - a list of (ip, port) addresses to connect to
 - a load balancing policy to decide which server to send a request to
 - a set of filters to mutate outgoing requests (say, by adding metadata)
-The resolver provides this data as a stream of grpc_resolver_result objects to
+The resolver provides this data as a stream of grpc_channel_args objects to
-the channel. We represent configuration as a stream so that it can be changed
+the channel. We represent arguments as a stream so that they can be changed
-by the resolver during execution, by reacting to external events (such as a
+by the resolver during execution, by reacting to external events (such as
-new configuration file being pushed to some store).
+new service configuration data being pushed to some store).
 Load Balancing
 --------------
-Load balancing configuration is provided by a grpc_lb_policy object, stored as
+Load balancing configuration is provided by a grpc_lb_policy object.
 part of grpc_resolver_result.
-The primary job of the load balancing policies is to pick a target server given only the
+The primary job of the load balancing policies is to pick a target server
-initial metadata for a request. It does this by providing a grpc_subchannel
+given only the initial metadata for a request. It does this by providing
-object to the owning channel.
+a grpc_subchannel object to the owning channel.
 Sub-Channels
--- a/src/core/ext/client_channel/client_channel.c
+++ b/src/core/ext/client_channel/client_channel.c
@ -43,7 +43,6 @@
 #include <grpc/support/useful.h>
 #include "src/core/ext/client_channel/lb_policy_registry.h"
 #include "src/core/ext/client_channel/method_config.h"
 #include "src/core/ext/client_channel/subchannel.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/connected_channel.h"
@ -56,6 +55,7 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/metadata.h"
 #include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/method_config.h"
 #include "src/core/lib/transport/static_metadata.h"
 /* Client channel implementation */
@ -127,7 +127,7 @@ typedef struct client_channel_channel_data {
  /** maps method names to method_parameters structs */
  grpc_mdstr_hash_table *method_params_table;
  /** incoming resolver result - set by resolver.next() */
-  grpc_resolver_result *resolver_result;
+  grpc_channel_args *resolver_result;
  /** a list of closures that are all waiting for config to come in */
  grpc_closure_list waiting_for_config_closures;
  /** resolver callback */
@ -232,35 +232,42 @@ static void on_resolver_result_changed(grpc_exec_ctx *exec_ctx, void *arg,
  if (chand->resolver_result != NULL) {
    grpc_lb_policy_args lb_policy_args;
-    lb_policy_args.server_name =
+    lb_policy_args.args = chand->resolver_result;
        grpc_resolver_result_get_server_name(chand->resolver_result);
    lb_policy_args.addresses =
        grpc_resolver_result_get_addresses(chand->resolver_result);
    lb_policy_args.additional_args =
        grpc_resolver_result_get_lb_policy_args(chand->resolver_result);
    lb_policy_args.client_channel_factory = chand->client_channel_factory;
    // Find LB policy name.
    const char *lb_policy_name = NULL;
    const grpc_arg *channel_arg =
        grpc_channel_args_find(lb_policy_args.args, GRPC_ARG_LB_POLICY_NAME);
    if (channel_arg != NULL) {
      GPR_ASSERT(channel_arg->type == GRPC_ARG_STRING);
      lb_policy_name = channel_arg->value.string;
    }
    // Special case: If all of the addresses are balancer addresses,
    // assume that we should use the grpclb policy, regardless of what the
    // resolver actually specified.
-    const char *lb_policy_name =
+    channel_arg =
-        grpc_resolver_result_get_lb_policy_name(chand->resolver_result);
+        grpc_channel_args_find(lb_policy_args.args, GRPC_ARG_LB_ADDRESSES);
-    bool found_backend_address = false;
+    if (channel_arg != NULL) {
-    for (size_t i = 0; i < lb_policy_args.addresses->num_addresses; ++i) {
+      GPR_ASSERT(channel_arg->type == GRPC_ARG_POINTER);
-      if (!lb_policy_args.addresses->addresses[i].is_balancer) {
+      grpc_lb_addresses *addresses = channel_arg->value.pointer.p;
-        found_backend_address = true;
+      bool found_backend_address = false;
-        break;
+      for (size_t i = 0; i < addresses->num_addresses; ++i) {
        if (!addresses->addresses[i].is_balancer) {
          found_backend_address = true;
          break;
        }
      }
-    }
+      if (!found_backend_address) {
-    if (!found_backend_address) {
+        if (lb_policy_name != NULL && strcmp(lb_policy_name, "grpclb") != 0) {
-      if (lb_policy_name != NULL && strcmp(lb_policy_name, "grpclb") != 0) {
+          gpr_log(GPR_INFO,
-        gpr_log(GPR_INFO,
+                  "resolver requested LB policy %s but provided only balancer "
-                "resolver requested LB policy %s but provided only balancer "
+                  "addresses, no backend addresses -- forcing use of grpclb LB "
-                "addresses, no backend addresses -- forcing use of grpclb LB "
+                  "policy",
-                "policy",
+                  lb_policy_name);
-                (lb_policy_name == NULL ? "(none)" : lb_policy_name));
+        }
        lb_policy_name = "grpclb";
      }
      lb_policy_name = "grpclb";
    }
    // Use pick_first if nothing was specified and we didn't select grpclb
    // above.
@ -274,15 +281,15 @@ static void on_resolver_result_changed(grpc_exec_ctx *exec_ctx, void *arg,
      state =
          grpc_lb_policy_check_connectivity(exec_ctx, lb_policy, &state_error);
    }
-    const grpc_arg *channel_arg = grpc_channel_args_find(
+    channel_arg =
-        lb_policy_args.additional_args, GRPC_ARG_SERVICE_CONFIG);
+        grpc_channel_args_find(lb_policy_args.args, GRPC_ARG_SERVICE_CONFIG);
    if (channel_arg != NULL) {
      GPR_ASSERT(channel_arg->type == GRPC_ARG_POINTER);
      method_params_table = grpc_method_config_table_convert(
          (grpc_method_config_table *)channel_arg->value.pointer.p,
          method_config_convert_value, &method_parameters_vtable);
    }
-    grpc_resolver_result_unref(exec_ctx, chand->resolver_result);
+    grpc_channel_args_destroy(chand->resolver_result);
    chand->resolver_result = NULL;
  }
@ -1015,6 +1022,10 @@ static void cc_destroy_call_elem(grpc_exec_ctx *exec_ctx,
  GPR_ASSERT(calld->creation_phase == GRPC_SUBCHANNEL_CALL_HOLDER_NOT_CREATING);
  gpr_mu_destroy(&calld->mu);
  GPR_ASSERT(calld->waiting_ops_count == 0);
  if (calld->connected_subchannel != NULL) {
    GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, calld->connected_subchannel,
                                    "picked");
  }
  gpr_free(calld->waiting_ops);
  gpr_free(and_free_memory);
 }
--- a/src/core/ext/client_channel/client_channel_factory.c
+++ b/src/core/ext/client_channel/client_channel_factory.c
@ -44,14 +44,14 @@ void grpc_client_channel_factory_unref(grpc_exec_ctx* exec_ctx,
 grpc_subchannel* grpc_client_channel_factory_create_subchannel(
    grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
-    grpc_subchannel_args* args) {
+    const grpc_subchannel_args* args) {
  return factory->vtable->create_subchannel(exec_ctx, factory, args);
 }
 grpc_channel* grpc_client_channel_factory_create_channel(
    grpc_exec_ctx* exec_ctx, grpc_client_channel_factory* factory,
    const char* target, grpc_client_channel_type type,
-    grpc_channel_args* args) {
+    const grpc_channel_args* args) {
  return factory->vtable->create_client_channel(exec_ctx, factory, target, type,
                                                args);
 }
--- a/src/core/ext/client_channel/client_channel_factory.h
+++ b/src/core/ext/client_channel/client_channel_factory.h
@ -60,12 +60,12 @@ struct grpc_client_channel_factory_vtable {
  void (*unref)(grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory);
  grpc_subchannel *(*create_subchannel)(grpc_exec_ctx *exec_ctx,
                                        grpc_client_channel_factory *factory,
-                                        grpc_subchannel_args *args);
+                                        const grpc_subchannel_args *args);
  grpc_channel *(*create_client_channel)(grpc_exec_ctx *exec_ctx,
                                         grpc_client_channel_factory *factory,
                                         const char *target,
                                         grpc_client_channel_type type,
-                                         grpc_channel_args *args);
+                                         const grpc_channel_args *args);
 };
 void grpc_client_channel_factory_ref(grpc_client_channel_factory *factory);
@ -75,11 +75,12 @@ void grpc_client_channel_factory_unref(grpc_exec_ctx *exec_ctx,
 /** Create a new grpc_subchannel */
 grpc_subchannel *grpc_client_channel_factory_create_subchannel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
-    grpc_subchannel_args *args);
+    const grpc_subchannel_args *args);
 /** Create a new grpc_channel */
 grpc_channel *grpc_client_channel_factory_create_channel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *factory,
-    const char *target, grpc_client_channel_type type, grpc_channel_args *args);
+    const char *target, grpc_client_channel_type type,
    const grpc_channel_args *args);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_CLIENT_CHANNEL_FACTORY_H */
--- a/src/core/ext/client_channel/connector.h
+++ b/src/core/ext/client_channel/connector.h
@ -35,7 +35,7 @@
 #define GRPC_CORE_EXT_CLIENT_CHANNEL_CONNECTOR_H
 #include "src/core/lib/channel/channel_stack.h"
-#include "src/core/lib/iomgr/sockaddr.h"
+#include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/transport/transport.h"
 typedef struct grpc_connector grpc_connector;
@ -49,7 +49,7 @@ typedef struct {
  /** set of pollsets interested in this connection */
  grpc_pollset_set *interested_parties;
  /** address to connect to */
-  const struct sockaddr *addr;
+  const grpc_resolved_address *addr;
  size_t addr_len;
  /** initial connect string to send */
  gpr_slice initial_connect_string;
--- a/src/core/ext/client_channel/default_initial_connect_string.c
+++ b/src/core/ext/client_channel/default_initial_connect_string.c
@ -32,8 +32,7 @@
 */
 #include <grpc/support/slice.h>
-#include "src/core/lib/iomgr/sockaddr.h"
+#include "src/core/lib/iomgr/resolve_address.h"
-void grpc_set_default_initial_connect_string(struct sockaddr **addr,
+void grpc_set_default_initial_connect_string(grpc_resolved_address **addr,
                                             size_t *addr_len,
                                             gpr_slice *initial_str) {}
--- a/src/core/ext/client_channel/initial_connect_string.c
+++ b/src/core/ext/client_channel/initial_connect_string.c
@ -35,9 +35,8 @@
 #include <stddef.h>
-extern void grpc_set_default_initial_connect_string(struct sockaddr **addr,
+extern void grpc_set_default_initial_connect_string(
-                                                    size_t *addr_len,
+    grpc_resolved_address **addr, gpr_slice *initial_str);
                                                    gpr_slice *initial_str);
 static grpc_set_initial_connect_string_func g_set_initial_connect_string_func =
    grpc_set_default_initial_connect_string;
@ -47,7 +46,7 @@ void grpc_test_set_initial_connect_string_function(
  g_set_initial_connect_string_func = func;
 }
-void grpc_set_initial_connect_string(struct sockaddr **addr, size_t *addr_len,
+void grpc_set_initial_connect_string(grpc_resolved_address **addr,
                                     gpr_slice *initial_str) {
-  g_set_initial_connect_string_func(addr, addr_len, initial_str);
+  g_set_initial_connect_string_func(addr, initial_str);
 }
--- a/src/core/ext/client_channel/initial_connect_string.h
+++ b/src/core/ext/client_channel/initial_connect_string.h
@ -35,16 +35,16 @@
 #define GRPC_CORE_EXT_CLIENT_CHANNEL_INITIAL_CONNECT_STRING_H
 #include <grpc/support/slice.h>
 #include "src/core/lib/iomgr/sockaddr.h"
-typedef void (*grpc_set_initial_connect_string_func)(struct sockaddr **addr,
+#include "src/core/lib/iomgr/resolve_address.h"
-                                                     size_t *addr_len,
+
-                                                     gpr_slice *initial_str);
+typedef void (*grpc_set_initial_connect_string_func)(
    grpc_resolved_address **addr, gpr_slice *initial_str);
 void grpc_test_set_initial_connect_string_function(
    grpc_set_initial_connect_string_func func);
 /** Set a string to be sent once connected. Optionally reset addr. */
-void grpc_set_initial_connect_string(struct sockaddr **addr, size_t *addr_len,
+void grpc_set_initial_connect_string(grpc_resolved_address **addr,
                                     gpr_slice *connect_string);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_INITIAL_CONNECT_STRING_H */
--- a/src/core/ext/client_channel/lb_policy_factory.c
+++ b/src/core/ext/client_channel/lb_policy_factory.c
@ -38,19 +38,20 @@
 #include "src/core/ext/client_channel/lb_policy_factory.h"
-grpc_lb_addresses* grpc_lb_addresses_create(size_t num_addresses) {
+grpc_lb_addresses* grpc_lb_addresses_create(
    size_t num_addresses, const grpc_lb_user_data_vtable* user_data_vtable) {
  grpc_lb_addresses* addresses = gpr_malloc(sizeof(grpc_lb_addresses));
  addresses->num_addresses = num_addresses;
  addresses->user_data_vtable = user_data_vtable;
  const size_t addresses_size = sizeof(grpc_lb_address) * num_addresses;
  addresses->addresses = gpr_malloc(addresses_size);
  memset(addresses->addresses, 0, addresses_size);
  return addresses;
 }
-grpc_lb_addresses* grpc_lb_addresses_copy(grpc_lb_addresses* addresses,
+grpc_lb_addresses* grpc_lb_addresses_copy(const grpc_lb_addresses* addresses) {
-                                          void* (*user_data_copy)(void*)) {
+  grpc_lb_addresses* new_addresses = grpc_lb_addresses_create(
-  grpc_lb_addresses* new_addresses =
+      addresses->num_addresses, addresses->user_data_vtable);
      grpc_lb_addresses_create(addresses->num_addresses);
  memcpy(new_addresses->addresses, addresses->addresses,
         sizeof(grpc_lb_address) * addresses->num_addresses);
  for (size_t i = 0; i < addresses->num_addresses; ++i) {
@ -58,9 +59,9 @@ grpc_lb_addresses* grpc_lb_addresses_copy(grpc_lb_addresses* addresses,
      new_addresses->addresses[i].balancer_name =
          gpr_strdup(new_addresses->addresses[i].balancer_name);
    }
-    if (user_data_copy != NULL) {
+    if (new_addresses->addresses[i].user_data != NULL) {
-      new_addresses->addresses[i].user_data =
+      new_addresses->addresses[i].user_data = addresses->user_data_vtable->copy(
-          user_data_copy(new_addresses->addresses[i].user_data);
+          new_addresses->addresses[i].user_data);
    }
  }
  return new_addresses;
@ -71,6 +72,7 @@ void grpc_lb_addresses_set_address(grpc_lb_addresses* addresses, size_t index,
                                   bool is_balancer, char* balancer_name,
                                   void* user_data) {
  GPR_ASSERT(index < addresses->num_addresses);
  if (user_data != NULL) GPR_ASSERT(addresses->user_data_vtable != NULL);
  grpc_lb_address* target = &addresses->addresses[index];
  memcpy(target->address.addr, address, address_len);
  target->address.len = address_len;
@ -79,18 +81,70 @@ void grpc_lb_addresses_set_address(grpc_lb_addresses* addresses, size_t index,
  target->user_data = user_data;
 }
-void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses,
+int grpc_lb_addresses_cmp(const grpc_lb_addresses* addresses1,
-                               void (*user_data_destroy)(void*)) {
+                          const grpc_lb_addresses* addresses2) {
  if (addresses1->num_addresses > addresses2->num_addresses) return 1;
  if (addresses1->num_addresses < addresses2->num_addresses) return -1;
  if (addresses1->user_data_vtable > addresses2->user_data_vtable) return 1;
  if (addresses1->user_data_vtable < addresses2->user_data_vtable) return -1;
  for (size_t i = 0; i < addresses1->num_addresses; ++i) {
    const grpc_lb_address* target1 = &addresses1->addresses[i];
    const grpc_lb_address* target2 = &addresses2->addresses[i];
    if (target1->address.len > target2->address.len) return 1;
    if (target1->address.len < target2->address.len) return -1;
    int retval = memcmp(target1->address.addr, target2->address.addr,
                        target1->address.len);
    if (retval != 0) return retval;
    if (target1->is_balancer > target2->is_balancer) return 1;
    if (target1->is_balancer < target2->is_balancer) return -1;
    const char* balancer_name1 =
        target1->balancer_name != NULL ? target1->balancer_name : "";
    const char* balancer_name2 =
        target2->balancer_name != NULL ? target2->balancer_name : "";
    retval = strcmp(balancer_name1, balancer_name2);
    if (retval != 0) return retval;
    if (addresses1->user_data_vtable != NULL) {
      retval = addresses1->user_data_vtable->cmp(target1->user_data,
                                                 target2->user_data);
      if (retval != 0) return retval;
    }
  }
  return 0;
 }
 void grpc_lb_addresses_destroy(grpc_lb_addresses* addresses) {
  for (size_t i = 0; i < addresses->num_addresses; ++i) {
    gpr_free(addresses->addresses[i].balancer_name);
-    if (user_data_destroy != NULL) {
+    if (addresses->addresses[i].user_data != NULL) {
-      user_data_destroy(addresses->addresses[i].user_data);
+      addresses->user_data_vtable->destroy(addresses->addresses[i].user_data);
    }
  }
  gpr_free(addresses->addresses);
  gpr_free(addresses);
 }
 static void* lb_addresses_copy(void* addresses) {
  return grpc_lb_addresses_copy(addresses);
 }
 static void lb_addresses_destroy(void* addresses) {
  grpc_lb_addresses_destroy(addresses);
 }
 static int lb_addresses_cmp(void* addresses1, void* addresses2) {
  return grpc_lb_addresses_cmp(addresses1, addresses2);
 }
 static const grpc_arg_pointer_vtable lb_addresses_arg_vtable = {
    lb_addresses_copy, lb_addresses_destroy, lb_addresses_cmp};
 grpc_arg grpc_lb_addresses_create_channel_arg(
    const grpc_lb_addresses* addresses) {
  grpc_arg arg;
  arg.type = GRPC_ARG_POINTER;
  arg.key = GRPC_ARG_LB_ADDRESSES;
  arg.value.pointer.p = (void*)addresses;
  arg.value.pointer.vtable = &lb_addresses_arg_vtable;
  return arg;
 }
 void grpc_lb_policy_factory_ref(grpc_lb_policy_factory* factory) {
  factory->vtable->ref(factory);
 }
--- a/src/core/ext/client_channel/lb_policy_factory.h
+++ b/src/core/ext/client_channel/lb_policy_factory.h
@ -59,19 +59,26 @@ typedef struct grpc_lb_address {
  void *user_data;
 } grpc_lb_address;
 typedef struct grpc_lb_user_data_vtable {
  void *(*copy)(void *);
  void (*destroy)(void *);
  int (*cmp)(void *, void *);
 } grpc_lb_user_data_vtable;
 typedef struct grpc_lb_addresses {
  size_t num_addresses;
  grpc_lb_address *addresses;
  const grpc_lb_user_data_vtable *user_data_vtable;
 } grpc_lb_addresses;
 /** Returns a grpc_addresses struct with enough space for
- * \a num_addresses addresses. */
+    \a num_addresses addresses.  The \a user_data_vtable argument may be
-grpc_lb_addresses *grpc_lb_addresses_create(size_t num_addresses);
+    NULL if no user data will be added. */
 grpc_lb_addresses *grpc_lb_addresses_create(
    size_t num_addresses, const grpc_lb_user_data_vtable *user_data_vtable);
-/** Creates a copy of \a addresses.  If \a user_data_copy is not NULL,
+/** Creates a copy of \a addresses. */
- * it will be invoked to copy the \a user_data field of each address. */
+grpc_lb_addresses *grpc_lb_addresses_copy(const grpc_lb_addresses *addresses);
 grpc_lb_addresses *grpc_lb_addresses_copy(grpc_lb_addresses *addresses,
                                          void *(*user_data_copy)(void *));
 /** Sets the value of the address at index \a index of \a addresses.
 * \a address is a socket address of length \a address_len.
@ -81,20 +88,21 @@ void grpc_lb_addresses_set_address(grpc_lb_addresses *addresses, size_t index,
                                   bool is_balancer, char *balancer_name,
                                   void *user_data);
-/** Destroys \a addresses.  If \a user_data_destroy is not NULL, it will
+/** Compares \a addresses1 and \a addresses2. */
- * be invoked to destroy the \a user_data field of each address. */
+int grpc_lb_addresses_cmp(const grpc_lb_addresses *addresses1,
-void grpc_lb_addresses_destroy(grpc_lb_addresses *addresses,
+                          const grpc_lb_addresses *addresses2);
-                               void (*user_data_destroy)(void *));
+
 /** Destroys \a addresses. */
 void grpc_lb_addresses_destroy(grpc_lb_addresses *addresses);
 /** Returns a channel arg containing \a addresses. */
 grpc_arg grpc_lb_addresses_create_channel_arg(
    const grpc_lb_addresses *addresses);
 /** Arguments passed to LB policies. */
 /* TODO(roth, ctiller): Consider replacing this struct with
   grpc_channel_args.  See comment in resolver_result.h for details. */
 typedef struct grpc_lb_policy_args {
  const char *server_name;
  grpc_lb_addresses *addresses;
  grpc_client_channel_factory *client_channel_factory;
-  /* Can be used to pass implementation-specific parameters to the LB policy. */
+  grpc_channel_args *args;
  grpc_channel_args *additional_args;
 } grpc_lb_policy_args;
 struct grpc_lb_policy_factory_vtable {
--- a/src/core/ext/client_channel/parse_address.c
+++ b/src/core/ext/client_channel/parse_address.c
@ -32,10 +32,11 @@
 */
 #include "src/core/ext/client_channel/parse_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include <stdio.h>
 #include <string.h>
-#ifdef GPR_HAVE_UNIX_SOCKET
+#ifdef GRPC_HAVE_UNIX_SOCKET
 #include <sys/un.h>
 #endif
@ -44,33 +45,39 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
-#ifdef GPR_HAVE_UNIX_SOCKET
+#ifdef GRPC_HAVE_UNIX_SOCKET
-int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
+
-  struct sockaddr_un *un = (struct sockaddr_un *)addr;
+int parse_unix(grpc_uri *uri, grpc_resolved_address *resolved_addr) {
  struct sockaddr_un *un = (struct sockaddr_un *)resolved_addr->addr;
  un->sun_family = AF_UNIX;
  strcpy(un->sun_path, uri->path);
-  *len = strlen(un->sun_path) + sizeof(un->sun_family) + 1;
+  resolved_addr->len = strlen(un->sun_path) + sizeof(un->sun_family) + 1;
  return 1;
 }
 #endif
-int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
+#else /* GRPC_HAVE_UNIX_SOCKET */
 int parse_unix(grpc_uri *uri, grpc_resolved_address *resolved_addr) { abort(); }
 #endif /* GRPC_HAVE_UNIX_SOCKET */
 int parse_ipv4(grpc_uri *uri, grpc_resolved_address *resolved_addr) {
  const char *host_port = uri->path;
  char *host;
  char *port;
  int port_num;
  int result = 0;
-  struct sockaddr_in *in = (struct sockaddr_in *)addr;
+  struct sockaddr_in *in = (struct sockaddr_in *)resolved_addr->addr;
  if (*host_port == '/') ++host_port;
  if (!gpr_split_host_port(host_port, &host, &port)) {
    return 0;
  }
-  memset(in, 0, sizeof(*in));
+  memset(resolved_addr, 0, sizeof(grpc_resolved_address));
-  *len = sizeof(*in);
+  resolved_addr->len = sizeof(struct sockaddr_in);
  in->sin_family = AF_INET;
  if (inet_pton(AF_INET, host, &in->sin_addr) == 0) {
    gpr_log(GPR_ERROR, "invalid ipv4 address: '%s'", host);
@ -96,13 +103,13 @@ done:
  return result;
 }
-int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
+int parse_ipv6(grpc_uri *uri, grpc_resolved_address *resolved_addr) {
  const char *host_port = uri->path;
  char *host;
  char *port;
  int port_num;
  int result = 0;
-  struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
+  struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)resolved_addr->addr;
  if (*host_port == '/') ++host_port;
  if (!gpr_split_host_port(host_port, &host, &port)) {
@ -110,7 +117,7 @@ int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len) {
  }
  memset(in6, 0, sizeof(*in6));
-  *len = sizeof(*in6);
+  resolved_addr->len = sizeof(*in6);
  in6->sin6_family = AF_INET6;
  if (inet_pton(AF_INET6, host, &in6->sin6_addr) == 0) {
    gpr_log(GPR_ERROR, "invalid ipv6 address: '%s'", host);
--- a/src/core/ext/client_channel/parse_address.h
+++ b/src/core/ext/client_channel/parse_address.h
@ -37,20 +37,18 @@
 #include <stddef.h>
 #include "src/core/ext/client_channel/uri_parser.h"
-#include "src/core/lib/iomgr/sockaddr.h"
+#include "src/core/lib/iomgr/resolve_address.h"
 #ifdef GPR_HAVE_UNIX_SOCKET
 /** Populate \a addr and \a len from \a uri, whose path is expected to contain a
 * unix socket path. Returns true upon success. */
-int parse_unix(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len);
+int parse_unix(grpc_uri *uri, grpc_resolved_address *resolved_addr);
 #endif
 /** Populate /a addr and \a len from \a uri, whose path is expected to contain a
 * host:port pair. Returns true upon success. */
-int parse_ipv4(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len);
+int parse_ipv4(grpc_uri *uri, grpc_resolved_address *resolved_addr);
 /** Populate /a addr and \a len from \a uri, whose path is expected to contain a
 * host:port pair. Returns true upon success. */
-int parse_ipv6(grpc_uri *uri, struct sockaddr_storage *addr, size_t *len);
+int parse_ipv6(grpc_uri *uri, grpc_resolved_address *resolved_addr);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_PARSE_ADDRESS_H */
--- a/src/core/ext/client_channel/resolver.c
+++ b/src/core/ext/client_channel/resolver.c
@ -76,7 +76,6 @@ void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx,
 }
 void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                        grpc_resolver_result **result,
+                        grpc_channel_args **result, grpc_closure *on_complete) {
                        grpc_closure *on_complete) {
  resolver->vtable->next(exec_ctx, resolver, result, on_complete);
 }
--- a/src/core/ext/client_channel/resolver.h
+++ b/src/core/ext/client_channel/resolver.h
@ -34,15 +34,13 @@
 #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H
 #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H
 #include "src/core/ext/client_channel/resolver_result.h"
 #include "src/core/ext/client_channel/subchannel.h"
 #include "src/core/lib/iomgr/iomgr.h"
 typedef struct grpc_resolver grpc_resolver;
 typedef struct grpc_resolver_vtable grpc_resolver_vtable;
-/** grpc_resolver provides grpc_resolver_result objects to grpc_channel
+/** \a grpc_resolver provides \a grpc_channel_args objects to its caller */
    objects */
 struct grpc_resolver {
  const grpc_resolver_vtable *vtable;
  gpr_refcount refs;
@ -53,7 +51,7 @@ struct grpc_resolver_vtable {
  void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver);
  void (*channel_saw_error)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver);
  void (*next)(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-               grpc_resolver_result **result, grpc_closure *on_complete);
+               grpc_channel_args **result, grpc_closure *on_complete);
 };
 #ifdef GRPC_RESOLVER_REFCOUNT_DEBUG
@ -81,14 +79,12 @@ void grpc_resolver_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver);
 void grpc_resolver_channel_saw_error(grpc_exec_ctx *exec_ctx,
                                     grpc_resolver *resolver);
-/** Get the next client config. Called by the channel to fetch a new
+/** Get the next result from the resolver.  Expected to set \a *result with
-    configuration. Expected to set *result with a new configuration,
+    new channel args and then schedule \a on_complete for execution.
    and then schedule on_complete for execution.
-    If resolution is fatally broken, set *result to NULL and
+    If resolution is fatally broken, set \a *result to NULL and
-    schedule on_complete. */
+    schedule \a on_complete. */
 void grpc_resolver_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                        grpc_resolver_result **result,
+                        grpc_channel_args **result, grpc_closure *on_complete);
                        grpc_closure *on_complete);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_H */
--- a/src/core/ext/client_channel/resolver_factory.h
+++ b/src/core/ext/client_channel/resolver_factory.h
@ -41,13 +41,14 @@
 typedef struct grpc_resolver_factory grpc_resolver_factory;
 typedef struct grpc_resolver_factory_vtable grpc_resolver_factory_vtable;
 /** grpc_resolver provides grpc_resolver_result objects to grpc_channel
    objects */
 struct grpc_resolver_factory {
  const grpc_resolver_factory_vtable *vtable;
 };
-typedef struct grpc_resolver_args { grpc_uri *uri; } grpc_resolver_args;
+typedef struct grpc_resolver_args {
  grpc_uri *uri;
  const grpc_channel_args *args;
 } grpc_resolver_args;
 struct grpc_resolver_factory_vtable {
  void (*ref)(grpc_resolver_factory *factory);
--- a/src/core/ext/client_channel/resolver_registry.c
+++ b/src/core/ext/client_channel/resolver_registry.c
@ -131,14 +131,16 @@ static grpc_resolver_factory *resolve_factory(const char *target,
  return factory;
 }
-grpc_resolver *grpc_resolver_create(const char *target) {
+grpc_resolver *grpc_resolver_create(const char *target,
                                    const grpc_channel_args *args) {
  grpc_uri *uri = NULL;
  grpc_resolver_factory *factory = resolve_factory(target, &uri);
  grpc_resolver *resolver;
-  grpc_resolver_args args;
+  grpc_resolver_args resolver_args;
-  memset(&args, 0, sizeof(args));
+  memset(&resolver_args, 0, sizeof(resolver_args));
-  args.uri = uri;
+  resolver_args.uri = uri;
-  resolver = grpc_resolver_factory_create_resolver(factory, &args);
+  resolver_args.args = args;
  resolver = grpc_resolver_factory_create_resolver(factory, &resolver_args);
  grpc_uri_destroy(uri);
  return resolver;
 }
--- a/src/core/ext/client_channel/resolver_registry.h
+++ b/src/core/ext/client_channel/resolver_registry.h
@ -57,8 +57,11 @@ void grpc_register_resolver_type(grpc_resolver_factory *factory);
    was not NULL).
    If a resolver factory was found, use it to instantiate a resolver and
    return it.
-    If a resolver factory was not found, return NULL. */
+    If a resolver factory was not found, return NULL.
-grpc_resolver *grpc_resolver_create(const char *target);
+    \a args is a set of channel arguments to be included in the result
    (typically the set of arguments passed in from the client API). */
 grpc_resolver *grpc_resolver_create(const char *target,
                                    const grpc_channel_args *args);
 /** Find a resolver factory given a name and return an (owned-by-the-caller)
 *  reference to it */
--- a/src/core/ext/client_channel/resolver_result.c
+++ b/src/core/ext/client_channel/resolver_result.c
@ -1,94 +0,0 @@
 //
 // Copyright 2015, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 #include "src/core/ext/client_channel/resolver_result.h"
 #include <string.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>
 #include "src/core/lib/channel/channel_args.h"
 struct grpc_resolver_result {
  gpr_refcount refs;
  char* server_name;
  grpc_lb_addresses* addresses;
  char* lb_policy_name;
  grpc_channel_args* lb_policy_args;
 };
 grpc_resolver_result* grpc_resolver_result_create(
    const char* server_name, grpc_lb_addresses* addresses,
    const char* lb_policy_name, grpc_channel_args* lb_policy_args) {
  grpc_resolver_result* result = gpr_malloc(sizeof(*result));
  memset(result, 0, sizeof(*result));
  gpr_ref_init(&result->refs, 1);
  result->server_name = gpr_strdup(server_name);
  result->addresses = addresses;
  result->lb_policy_name = gpr_strdup(lb_policy_name);
  result->lb_policy_args = lb_policy_args;
  return result;
 }
 void grpc_resolver_result_ref(grpc_resolver_result* result) {
  gpr_ref(&result->refs);
 }
 void grpc_resolver_result_unref(grpc_exec_ctx* exec_ctx,
                                grpc_resolver_result* result) {
  if (gpr_unref(&result->refs)) {
    gpr_free(result->server_name);
    grpc_lb_addresses_destroy(result->addresses, NULL /* user_data_destroy */);
    gpr_free(result->lb_policy_name);
    grpc_channel_args_destroy(result->lb_policy_args);
    gpr_free(result);
  }
 }
 const char* grpc_resolver_result_get_server_name(grpc_resolver_result* result) {
  return result->server_name;
 }
 grpc_lb_addresses* grpc_resolver_result_get_addresses(
    grpc_resolver_result* result) {
  return result->addresses;
 }
 const char* grpc_resolver_result_get_lb_policy_name(
    grpc_resolver_result* result) {
  return result->lb_policy_name;
 }
 grpc_channel_args* grpc_resolver_result_get_lb_policy_args(
    grpc_resolver_result* result) {
  return result->lb_policy_args;
 }
--- a/src/core/ext/client_channel/resolver_result.h
+++ b/src/core/ext/client_channel/resolver_result.h
@ -1,68 +0,0 @@
 //
 // Copyright 2015, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 #ifndef GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H
 #define GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H
 #include "src/core/ext/client_channel/lb_policy_factory.h"
 // TODO(roth, ctiller): In the long term, we are considering replacing
 // the resolver_result data structure with grpc_channel_args.  The idea is
 // that the resolver will return a set of channel args that contains the
 // information that is currently in the resolver_result struct.  For
 // example, there will be specific args indicating the set of addresses
 // and the name of the LB policy to instantiate.  Note that if we did
 // this, we would probably want to change the data structure of
 // grpc_channel_args such to a hash table or AVL or some other data
 // structure that does not require linear search to find keys.
 /// Results reported from a grpc_resolver.
 typedef struct grpc_resolver_result grpc_resolver_result;
 /// Takes ownership of \a addresses and \a lb_policy_args.
 grpc_resolver_result* grpc_resolver_result_create(
    const char* server_name, grpc_lb_addresses* addresses,
    const char* lb_policy_name, grpc_channel_args* lb_policy_args);
 void grpc_resolver_result_ref(grpc_resolver_result* result);
 void grpc_resolver_result_unref(grpc_exec_ctx* exec_ctx,
                                grpc_resolver_result* result);
 /// Accessors.  Caller does NOT take ownership of results.
 const char* grpc_resolver_result_get_server_name(grpc_resolver_result* result);
 grpc_lb_addresses* grpc_resolver_result_get_addresses(
    grpc_resolver_result* result);
 const char* grpc_resolver_result_get_lb_policy_name(
    grpc_resolver_result* result);
 grpc_channel_args* grpc_resolver_result_get_lb_policy_args(
    grpc_resolver_result* result);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_RESOLVER_RESULT_H */
--- a/src/core/ext/client_channel/subchannel.c
+++ b/src/core/ext/client_channel/subchannel.c
@ -95,8 +95,7 @@ struct grpc_subchannel {
  /** channel arguments */
  grpc_channel_args *args;
  /** address to connect to */
-  struct sockaddr *addr;
+  grpc_resolved_address *addr;
  size_t addr_len;
  grpc_subchannel_key *key;
@ -184,9 +183,10 @@ static void connection_destroy(grpc_exec_ctx *exec_ctx, void *arg,
  gpr_free(c);
 }
-void grpc_connected_subchannel_ref(
+grpc_connected_subchannel *grpc_connected_subchannel_ref(
    grpc_connected_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) {
  GRPC_CHANNEL_STACK_REF(CHANNEL_STACK_FROM_CONNECTION(c), REF_REASON);
  return c;
 }
 void grpc_connected_subchannel_unref(grpc_exec_ctx *exec_ctx,
@ -298,7 +298,7 @@ void grpc_subchannel_weak_unref(grpc_exec_ctx *exec_ctx,
 grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx,
                                        grpc_connector *connector,
-                                        grpc_subchannel_args *args) {
+                                        const grpc_subchannel_args *args) {
  grpc_subchannel_key *key = grpc_subchannel_key_create(connector, args);
  grpc_subchannel *c = grpc_subchannel_index_find(exec_ctx, key);
  if (c) {
@ -320,12 +320,11 @@ grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx,
  } else {
    c->filters = NULL;
  }
-  c->addr = gpr_malloc(args->addr_len);
+  c->addr = gpr_malloc(sizeof(grpc_resolved_address));
-  if (args->addr_len) memcpy(c->addr, args->addr, args->addr_len);
+  if (args->addr->len)
    memcpy(c->addr, args->addr, sizeof(grpc_resolved_address));
  c->pollset_set = grpc_pollset_set_create();
-  c->addr_len = args->addr_len;
+  grpc_set_initial_connect_string(&c->addr, &c->initial_connect_string);
  grpc_set_initial_connect_string(&c->addr, &c->addr_len,
                                  &c->initial_connect_string);
  c->args = grpc_channel_args_copy(args->args);
  c->root_external_state_watcher.next = c->root_external_state_watcher.prev =
      &c->root_external_state_watcher;
@ -376,7 +375,6 @@ static void continue_connect(grpc_exec_ctx *exec_ctx, grpc_subchannel *c) {
  args.interested_parties = c->pollset_set;
  args.addr = c->addr;
  args.addr_len = c->addr_len;
  args.deadline = c->next_attempt;
  args.channel_args = c->args;
  args.initial_connect_string = c->initial_connect_string;
--- a/src/core/ext/client_channel/subchannel.h
+++ b/src/core/ext/client_channel/subchannel.h
@ -97,7 +97,7 @@ grpc_subchannel *grpc_subchannel_weak_ref(
 void grpc_subchannel_weak_unref(grpc_exec_ctx *exec_ctx,
                                grpc_subchannel *channel
                                    GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
-void grpc_connected_subchannel_ref(
+grpc_connected_subchannel *grpc_connected_subchannel_ref(
    grpc_connected_subchannel *channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS);
 void grpc_connected_subchannel_unref(grpc_exec_ctx *exec_ctx,
                                     grpc_connected_subchannel *channel
@ -167,13 +167,12 @@ struct grpc_subchannel_args {
  /** Server name */
  const char *server_name;
  /** Address to connect to */
-  struct sockaddr *addr;
+  grpc_resolved_address *addr;
  size_t addr_len;
 };
 /** create a subchannel given a connector */
 grpc_subchannel *grpc_subchannel_create(grpc_exec_ctx *exec_ctx,
                                        grpc_connector *connector,
-                                        grpc_subchannel_args *args);
+                                        const grpc_subchannel_args *args);
 #endif /* GRPC_CORE_EXT_CLIENT_CHANNEL_SUBCHANNEL_H */
--- a/src/core/ext/client_channel/subchannel_index.c
+++ b/src/core/ext/client_channel/subchannel_index.c
@ -73,7 +73,7 @@ static grpc_exec_ctx *current_ctx() {
 }
 static grpc_subchannel_key *create_key(
-    grpc_connector *connector, grpc_subchannel_args *args,
+    grpc_connector *connector, const grpc_subchannel_args *args,
    grpc_channel_args *(*copy_channel_args)(const grpc_channel_args *args)) {
  grpc_subchannel_key *k = gpr_malloc(sizeof(*k));
  k->connector = grpc_connector_ref(connector);
@ -87,17 +87,17 @@ static grpc_subchannel_key *create_key(
    k->args.filters = NULL;
  }
  k->args.server_name = gpr_strdup(args->server_name);
-  k->args.addr_len = args->addr_len;
+  k->args.addr = gpr_malloc(sizeof(grpc_resolved_address));
-  k->args.addr = gpr_malloc(args->addr_len);
+  k->args.addr->len = args->addr->len;
-  if (k->args.addr_len > 0) {
+  if (k->args.addr->len > 0) {
-    memcpy(k->args.addr, args->addr, k->args.addr_len);
+    memcpy(k->args.addr, args->addr, sizeof(grpc_resolved_address));
  }
  k->args.args = copy_channel_args(args->args);
  return k;
 }
-grpc_subchannel_key *grpc_subchannel_key_create(grpc_connector *connector,
+grpc_subchannel_key *grpc_subchannel_key_create(
-                                                grpc_subchannel_args *args) {
+    grpc_connector *connector, const grpc_subchannel_args *args) {
  return create_key(connector, args, grpc_channel_args_normalize);
 }
@ -109,14 +109,14 @@ static int subchannel_key_compare(grpc_subchannel_key *a,
                                  grpc_subchannel_key *b) {
  int c = GPR_ICMP(a->connector, b->connector);
  if (c != 0) return c;
-  c = GPR_ICMP(a->args.addr_len, b->args.addr_len);
+  c = GPR_ICMP(a->args.addr->len, b->args.addr->len);
  if (c != 0) return c;
  c = GPR_ICMP(a->args.filter_count, b->args.filter_count);
  if (c != 0) return c;
  c = strcmp(a->args.server_name, b->args.server_name);
  if (c != 0) return c;
-  if (a->args.addr_len) {
+  if (a->args.addr->len) {
-    c = memcmp(a->args.addr, b->args.addr, a->args.addr_len);
+    c = memcmp(a->args.addr->addr, b->args.addr->addr, a->args.addr->len);
    if (c != 0) return c;
  }
  if (a->args.filter_count > 0) {
--- a/src/core/ext/client_channel/subchannel_index.h
+++ b/src/core/ext/client_channel/subchannel_index.h
@ -43,8 +43,8 @@
 typedef struct grpc_subchannel_key grpc_subchannel_key;
 /** Create a key that can be used to uniquely identify a subchannel */
-grpc_subchannel_key *grpc_subchannel_key_create(grpc_connector *con,
+grpc_subchannel_key *grpc_subchannel_key_create(
-                                                grpc_subchannel_args *args);
+    grpc_connector *con, const grpc_subchannel_args *args);
 /** Destroy a subchannel key */
 void grpc_subchannel_key_destroy(grpc_exec_ctx *exec_ctx,
--- a/src/core/ext/lb_policy/grpclb/grpclb.c
+++ b/src/core/ext/lb_policy/grpclb/grpclb.c
@ -96,6 +96,12 @@
 * - Implement LB service forwarding (point 2c. in the doc's diagram).
 */
 /* With the addition of a libuv endpoint, sockaddr.h now includes uv.h when
   using that endpoint. Because of various transitive includes in uv.h,
   including windows.h on Windows, uv.h must be included before other system
   headers. Therefore, sockaddr.h must always be included first */
 #include "src/core/lib/iomgr/sockaddr.h"
 #include <errno.h>
 #include <string.h>
@ -114,7 +120,6 @@
 #include "src/core/ext/lb_policy/grpclb/grpclb.h"
 #include "src/core/ext/lb_policy/grpclb/load_balancer_api.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
 #include "src/core/lib/support/string.h"
 #include "src/core/lib/surface/call.h"
@ -338,6 +343,21 @@ static bool is_server_valid(const grpc_grpclb_server *server, size_t idx,
  return true;
 }
 /* vtable for LB tokens in grpc_lb_addresses. */
 static void *lb_token_copy(void *token) {
  return token == NULL ? NULL : GRPC_MDELEM_REF(token);
 }
 static void lb_token_destroy(void *token) {
  if (token != NULL) GRPC_MDELEM_UNREF(token);
 }
 static int lb_token_cmp(void *token1, void *token2) {
  if (token1 > token2) return 1;
  if (token1 < token2) return -1;
  return 0;
 }
 static const grpc_lb_user_data_vtable lb_token_vtable = {
    lb_token_copy, lb_token_destroy, lb_token_cmp};
 /* Returns addresses extracted from \a serverlist. */
 static grpc_lb_addresses *process_serverlist(
    const grpc_grpclb_serverlist *serverlist) {
@ -349,7 +369,8 @@ static grpc_lb_addresses *process_serverlist(
  }
  if (num_valid == 0) return NULL;
-  grpc_lb_addresses *lb_addresses = grpc_lb_addresses_create(num_valid);
+  grpc_lb_addresses *lb_addresses =
      grpc_lb_addresses_create(num_valid, &lb_token_vtable);
  /* second pass: actually populate the addresses and LB tokens (aka user data
   * to the outside world) to be read by the RR policy during its creation.
@ -396,7 +417,7 @@ static grpc_lb_addresses *process_serverlist(
      gpr_log(GPR_ERROR,
              "Missing LB token for backend address '%s'. The empty token will "
              "be used instead",
-              grpc_sockaddr_to_uri((struct sockaddr *)&addr.addr));
+              grpc_sockaddr_to_uri(&addr));
      user_data = GRPC_MDELEM_LB_TOKEN_EMPTY;
    }
@ -410,11 +431,6 @@ static grpc_lb_addresses *process_serverlist(
  return lb_addresses;
 }
 /* A plugin for grpc_lb_addresses_destroy that unrefs the LB token metadata. */
 static void lb_token_destroy(void *token) {
  if (token != NULL) GRPC_MDELEM_UNREF(token);
 }
 /* perform a pick over \a rr_policy. Given that a pick can return immediately
 * (ignoring its completion callback) we need to perform the cleanups this
 * callback would be otherwise resposible for */
@ -454,20 +470,27 @@ static grpc_lb_policy *create_rr_locked(
    glb_lb_policy *glb_policy) {
  GPR_ASSERT(serverlist != NULL && serverlist->num_servers > 0);
  if (glb_policy->addresses != NULL) {
    /* dispose of the previous version */
    grpc_lb_addresses_destroy(glb_policy->addresses);
  }
  glb_policy->addresses = process_serverlist(serverlist);
  grpc_lb_policy_args args;
  memset(&args, 0, sizeof(args));
  args.server_name = glb_policy->server_name;
  args.client_channel_factory = glb_policy->cc_factory;
  args.addresses = process_serverlist(serverlist);
  args.additional_args = glb_policy->args;
-  grpc_lb_policy *rr = grpc_lb_policy_create(exec_ctx, "round_robin", &args);
+  // Replace the LB addresses in the channel args that we pass down to
  // the subchannel.
  static const char *keys_to_remove[] = {GRPC_ARG_LB_ADDRESSES};
  const grpc_arg arg =
      grpc_lb_addresses_create_channel_arg(glb_policy->addresses);
  args.args = grpc_channel_args_copy_and_add_and_remove(
      glb_policy->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove), &arg,
      1);
-  if (glb_policy->addresses != NULL) {
+  grpc_lb_policy *rr = grpc_lb_policy_create(exec_ctx, "round_robin", &args);
-    /* dispose of the previous version */
+  grpc_channel_args_destroy(args.args);
    grpc_lb_addresses_destroy(glb_policy->addresses, lb_token_destroy);
  }
  glb_policy->addresses = args.addresses;
  return rr;
 }
@ -563,6 +586,12 @@ static void glb_rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
 static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
                                  grpc_lb_policy_factory *factory,
                                  grpc_lb_policy_args *args) {
  /* Get server name. */
  const grpc_arg *arg =
      grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
  const char *server_name =
      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
  /* Count the number of gRPC-LB addresses. There must be at least one.
   * TODO(roth): For now, we ignore non-balancer addresses, but in the
   * future, we may change the behavior such that we fall back to using
@ -570,24 +599,27 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
   * time, this should be changed to allow a list with no balancer addresses,
   * since the resolver might fail to return a balancer address even when
   * this is the right LB policy to use. */
  arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
  GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
  grpc_lb_addresses *addresses = arg->value.pointer.p;
  size_t num_grpclb_addrs = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; ++i) {
+  for (size_t i = 0; i < addresses->num_addresses; ++i) {
-    if (args->addresses->addresses[i].is_balancer) ++num_grpclb_addrs;
+    if (addresses->addresses[i].is_balancer) ++num_grpclb_addrs;
  }
  if (num_grpclb_addrs == 0) return NULL;
  glb_lb_policy *glb_policy = gpr_malloc(sizeof(*glb_policy));
  memset(glb_policy, 0, sizeof(*glb_policy));
-  /* All input addresses in args->addresses come from a resolver that claims
+  /* All input addresses in addresses come from a resolver that claims
   * they are LB services. It's the resolver's responsibility to make sure
   * this
   * policy is only instantiated and used in that case.
   *
   * Create a client channel over them to communicate with a LB service */
-  glb_policy->server_name = gpr_strdup(args->server_name);
+  glb_policy->server_name = gpr_strdup(server_name);
  glb_policy->cc_factory = args->client_channel_factory;
-  glb_policy->args = grpc_channel_args_copy(args->additional_args);
+  glb_policy->args = grpc_channel_args_copy(args->args);
  GPR_ASSERT(glb_policy->cc_factory != NULL);
  /* construct a target from the addresses in args, given in the form
@ -595,22 +627,19 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
   * TODO(dgq): support mixed ip version */
  char **addr_strs = gpr_malloc(sizeof(char *) * num_grpclb_addrs);
  size_t addr_index = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+  for (size_t i = 0; i < addresses->num_addresses; i++) {
-    if (args->addresses->addresses[i].user_data != NULL) {
+    if (addresses->addresses[i].user_data != NULL) {
      gpr_log(GPR_ERROR,
              "This LB policy doesn't support user data. It will be ignored");
    }
-    if (args->addresses->addresses[i].is_balancer) {
+    if (addresses->addresses[i].is_balancer) {
      if (addr_index == 0) {
-        addr_strs[addr_index++] = grpc_sockaddr_to_uri(
+        addr_strs[addr_index++] =
-            (const struct sockaddr *)&args->addresses->addresses[i]
+            grpc_sockaddr_to_uri(&addresses->addresses[i].address);
                .address.addr);
      } else {
-        GPR_ASSERT(grpc_sockaddr_to_string(
+        GPR_ASSERT(grpc_sockaddr_to_string(&addr_strs[addr_index++],
-                       &addr_strs[addr_index++],
+                                           &addresses->addresses[i].address,
-                       (const struct sockaddr *)&args->addresses->addresses[i]
+                                           true) > 0);
                           .address.addr,
                       true) > 0);
      }
    }
  }
@ -618,10 +647,29 @@ static grpc_lb_policy *glb_create(grpc_exec_ctx *exec_ctx,
  char *target_uri_str = gpr_strjoin_sep((const char **)addr_strs,
                                         num_grpclb_addrs, ",", &uri_path_len);
-  /* will pick using pick_first */
+  /* Create a channel to talk to the LBs.
   *
   * We strip out the channel arg for the LB policy name, since we want
   * to use the default (pick_first) in this case.
   *
   * We also strip out the channel arg for the resolved addresses, since
   * that will be generated by the name resolver used in the LB channel.
   * Note that the LB channel will use the sockaddr resolver, so this
   * won't actually generate a query to DNS (or some other name service).
   * However, the addresses returned by the sockaddr resolver will have
   * is_balancer=false, whereas our own addresses have is_balancer=true.
   * We need the LB channel to return addresses with is_balancer=false
   * so that it does not wind up recursively using the grpclb LB policy,
   * as per the special case logic in client_channel.c.
   */
  static const char *keys_to_remove[] = {GRPC_ARG_LB_POLICY_NAME,
                                         GRPC_ARG_LB_ADDRESSES};
  grpc_channel_args *new_args = grpc_channel_args_copy_and_remove(
      args->args, keys_to_remove, GPR_ARRAY_SIZE(keys_to_remove));
  glb_policy->lb_channel = grpc_client_channel_factory_create_channel(
      exec_ctx, glb_policy->cc_factory, target_uri_str,
-      GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, NULL);
+      GRPC_CLIENT_CHANNEL_TYPE_LOAD_BALANCING, new_args);
  grpc_channel_args_destroy(new_args);
  gpr_free(target_uri_str);
  for (size_t i = 0; i < num_grpclb_addrs; i++) {
@ -662,7 +710,7 @@ static void glb_destroy(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
    grpc_grpclb_destroy_serverlist(glb_policy->serverlist);
  }
  gpr_mu_destroy(&glb_policy->mu);
-  grpc_lb_addresses_destroy(glb_policy->addresses, lb_token_destroy);
+  grpc_lb_addresses_destroy(glb_policy->addresses);
  gpr_free(glb_policy);
 }
--- a/src/core/ext/lb_policy/pick_first/pick_first.c
+++ b/src/core/ext/lb_policy/pick_first/pick_first.c
@ -34,7 +34,9 @@
 #include <string.h>
 #include <grpc/support/alloc.h>
 #include "src/core/ext/client_channel/lb_policy_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/connectivity_state.h"
 typedef struct pending_pick {
@ -207,7 +209,7 @@ static int pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
  /* Check atomically for a selected channel */
  grpc_connected_subchannel *selected = GET_SELECTED(p);
  if (selected != NULL) {
-    *target = selected;
+    *target = GRPC_CONNECTED_SUBCHANNEL_REF(selected, "picked");
    return 1;
  }
@ -216,7 +218,7 @@ static int pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
  selected = GET_SELECTED(p);
  if (selected) {
    gpr_mu_unlock(&p->mu);
-    *target = selected;
+    *target = GRPC_CONNECTED_SUBCHANNEL_REF(selected, "picked");
    return 1;
  } else {
    if (!p->started_picking) {
@ -308,7 +310,7 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
        /* update any calls that were waiting for a pick */
        while ((pp = p->pending_picks)) {
          p->pending_picks = pp->next;
-          *pp->target = selected;
+          *pp->target = GRPC_CONNECTED_SUBCHANNEL_REF(selected, "picked");
          grpc_exec_ctx_sched(exec_ctx, pp->on_complete, GRPC_ERROR_NONE, NULL);
          gpr_free(pp);
        }
@ -432,14 +434,22 @@ static void pick_first_factory_unref(grpc_lb_policy_factory *factory) {}
 static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
                                         grpc_lb_policy_factory *factory,
                                         grpc_lb_policy_args *args) {
  GPR_ASSERT(args->addresses != NULL);
  GPR_ASSERT(args->client_channel_factory != NULL);
  /* Get server name. */
  const grpc_arg *arg =
      grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
  const char *server_name =
      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
  /* Find the number of backend addresses. We ignore balancer
   * addresses, since we don't know how to handle them. */
  arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
  GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
  grpc_lb_addresses *addresses = arg->value.pointer.p;
  size_t num_addrs = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+  for (size_t i = 0; i < addresses->num_addresses; i++) {
-    if (!args->addresses->addresses[i].is_balancer) ++num_addrs;
+    if (!addresses->addresses[i].is_balancer) ++num_addrs;
  }
  if (num_addrs == 0) return NULL;
@ -450,23 +460,21 @@ static grpc_lb_policy *create_pick_first(grpc_exec_ctx *exec_ctx,
  memset(p->subchannels, 0, sizeof(*p->subchannels) * num_addrs);
  grpc_subchannel_args sc_args;
  size_t subchannel_idx = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+  for (size_t i = 0; i < addresses->num_addresses; i++) {
    /* Skip balancer addresses, since we only know how to handle backends. */
-    if (args->addresses->addresses[i].is_balancer) continue;
+    if (addresses->addresses[i].is_balancer) continue;
-    if (args->addresses->addresses[i].user_data != NULL) {
+    if (addresses->addresses[i].user_data != NULL) {
      gpr_log(GPR_ERROR,
              "This LB policy doesn't support user data. It will be ignored");
    }
    memset(&sc_args, 0, sizeof(grpc_subchannel_args));
    /* server_name will be copied as part of the subchannel creation. This makes
-     * the copying of args->server_name (a borrowed pointer) OK. */
+     * the copying of server_name (a borrowed pointer) OK. */
-    sc_args.server_name = args->server_name;
+    sc_args.server_name = server_name;
-    sc_args.addr =
+    sc_args.addr = &addresses->addresses[i].address;
-        (struct sockaddr *)(&args->addresses->addresses[i].address.addr);
+    sc_args.args = args->args;
    sc_args.addr_len = args->addresses->addresses[i].address.len;
    sc_args.args = args->additional_args;
    grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
        exec_ctx, args->client_channel_factory, &sc_args);
--- a/src/core/ext/lb_policy/round_robin/round_robin.c
+++ b/src/core/ext/lb_policy/round_robin/round_robin.c
@ -64,6 +64,7 @@
 #include <grpc/support/alloc.h>
 #include "src/core/ext/client_channel/lb_policy_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/static_metadata.h"
@ -396,7 +397,9 @@ static int rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
  gpr_mu_lock(&p->mu);
  if ((selected = peek_next_connected_locked(p))) {
    /* readily available, report right away */
-    *target = grpc_subchannel_get_connected_subchannel(selected->subchannel);
+    *target = GRPC_CONNECTED_SUBCHANNEL_REF(
        grpc_subchannel_get_connected_subchannel(selected->subchannel),
        "picked");
    if (user_data != NULL) {
      *user_data = selected->user_data;
@ -462,8 +465,9 @@ static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
        while ((pp = p->pending_picks)) {
          p->pending_picks = pp->next;
-          *pp->target =
+          *pp->target = GRPC_CONNECTED_SUBCHANNEL_REF(
-              grpc_subchannel_get_connected_subchannel(selected->subchannel);
+              grpc_subchannel_get_connected_subchannel(selected->subchannel),
              "picked");
          if (pp->user_data != NULL) {
            *pp->user_data = selected->user_data;
          }
@ -577,7 +581,9 @@ static void rr_ping_one(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
  gpr_mu_lock(&p->mu);
  if ((selected = peek_next_connected_locked(p))) {
    gpr_mu_unlock(&p->mu);
-    target = grpc_subchannel_get_connected_subchannel(selected->subchannel);
+    target = GRPC_CONNECTED_SUBCHANNEL_REF(
        grpc_subchannel_get_connected_subchannel(selected->subchannel),
        "picked");
    grpc_connected_subchannel_ping(exec_ctx, target, closure);
  } else {
    gpr_mu_unlock(&p->mu);
@ -598,14 +604,22 @@ static void round_robin_factory_unref(grpc_lb_policy_factory *factory) {}
 static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
                                          grpc_lb_policy_factory *factory,
                                          grpc_lb_policy_args *args) {
  GPR_ASSERT(args->addresses != NULL);
  GPR_ASSERT(args->client_channel_factory != NULL);
  /* Get server name. */
  const grpc_arg *arg =
      grpc_channel_args_find(args->args, GRPC_ARG_SERVER_NAME);
  const char *server_name =
      arg != NULL && arg->type == GRPC_ARG_STRING ? arg->value.string : NULL;
  /* Find the number of backend addresses. We ignore balancer
   * addresses, since we don't know how to handle them. */
  arg = grpc_channel_args_find(args->args, GRPC_ARG_LB_ADDRESSES);
  GPR_ASSERT(arg != NULL && arg->type == GRPC_ARG_POINTER);
  grpc_lb_addresses *addresses = arg->value.pointer.p;
  size_t num_addrs = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+  for (size_t i = 0; i < addresses->num_addresses; i++) {
-    if (!args->addresses->addresses[i].is_balancer) ++num_addrs;
+    if (!addresses->addresses[i].is_balancer) ++num_addrs;
  }
  if (num_addrs == 0) return NULL;
@ -618,18 +632,16 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
  grpc_subchannel_args sc_args;
  size_t subchannel_idx = 0;
-  for (size_t i = 0; i < args->addresses->num_addresses; i++) {
+  for (size_t i = 0; i < addresses->num_addresses; i++) {
    /* Skip balancer addresses, since we only know how to handle backends. */
-    if (args->addresses->addresses[i].is_balancer) continue;
+    if (addresses->addresses[i].is_balancer) continue;
    memset(&sc_args, 0, sizeof(grpc_subchannel_args));
    /* server_name will be copied as part of the subchannel creation. This makes
-     * the copying of args->server_name (a borrowed pointer) OK. */
+     * the copying of server_name (a borrowed pointer) OK. */
-    sc_args.server_name = args->server_name;
+    sc_args.server_name = server_name;
-    sc_args.addr =
+    sc_args.addr = &addresses->addresses[i].address;
-        (struct sockaddr *)(&args->addresses->addresses[i].address.addr);
+    sc_args.args = args->args;
    sc_args.addr_len = args->addresses->addresses[i].address.len;
    sc_args.args = args->additional_args;
    grpc_subchannel *subchannel = grpc_client_channel_factory_create_subchannel(
        exec_ctx, args->client_channel_factory, &sc_args);
@ -641,7 +653,7 @@ static grpc_lb_policy *round_robin_create(grpc_exec_ctx *exec_ctx,
      sd->policy = p;
      sd->index = subchannel_idx;
      sd->subchannel = subchannel;
-      sd->user_data = args->addresses->addresses[i].user_data;
+      sd->user_data = addresses->addresses[i].user_data;
      ++subchannel_idx;
      grpc_closure_init(&sd->connectivity_changed_closure,
                        rr_connectivity_changed, sd);
--- a/src/core/ext/resolver/dns/native/dns_resolver.c
+++ b/src/core/ext/resolver/dns/native/dns_resolver.c
@ -40,6 +40,7 @@
 #include "src/core/ext/client_channel/http_connect_handshaker.h"
 #include "src/core/ext/client_channel/lb_policy_registry.h"
 #include "src/core/ext/client_channel/resolver_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/support/backoff.h"
@ -53,12 +54,12 @@
 typedef struct {
  /** base class: must be first */
  grpc_resolver base;
-  /** target name */
+  /** name to resolve */
  char *target_name;
  /** name to resolve (usually the same as target_name) */
  char *name_to_resolve;
  /** default port to use */
  char *default_port;
  /** channel args. */
  grpc_channel_args *channel_args;
  /** mutex guarding the rest of the state */
  gpr_mu mu;
@ -71,9 +72,9 @@ typedef struct {
  /** pending next completion, or NULL */
  grpc_closure *next_completion;
  /** target result address for next completion */
-  grpc_resolver_result **target_result;
+  grpc_channel_args **target_result;
  /** current (fully resolved) result */
-  grpc_resolver_result *resolved_result;
+  grpc_channel_args *resolved_result;
  /** retry timer */
  bool have_retry_timer;
  grpc_timer retry_timer;
@ -94,7 +95,7 @@ static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 static void dns_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *r);
 static void dns_channel_saw_error(grpc_exec_ctx *exec_ctx, grpc_resolver *r);
 static void dns_next(grpc_exec_ctx *exec_ctx, grpc_resolver *r,
-                     grpc_resolver_result **target_result,
+                     grpc_channel_args **target_result,
                     grpc_closure *on_complete);
 static const grpc_resolver_vtable dns_resolver_vtable = {
@ -127,7 +128,7 @@ static void dns_channel_saw_error(grpc_exec_ctx *exec_ctx,
 }
 static void dns_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                     grpc_resolver_result **target_result,
+                     grpc_channel_args **target_result,
                     grpc_closure *on_complete) {
  dns_resolver *r = (dns_resolver *)resolver;
  gpr_mu_lock(&r->mu);
@ -162,22 +163,23 @@ static void dns_on_retry_timer(grpc_exec_ctx *exec_ctx, void *arg,
 static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
                            grpc_error *error) {
  dns_resolver *r = arg;
-  grpc_resolver_result *result = NULL;
+  grpc_channel_args *result = NULL;
  gpr_mu_lock(&r->mu);
  GPR_ASSERT(r->resolving);
  r->resolving = false;
  if (r->addresses != NULL) {
-    grpc_lb_addresses *addresses =
+    grpc_lb_addresses *addresses = grpc_lb_addresses_create(
-        grpc_lb_addresses_create(r->addresses->naddrs);
+        r->addresses->naddrs, NULL /* user_data_vtable */);
    for (size_t i = 0; i < r->addresses->naddrs; ++i) {
      grpc_lb_addresses_set_address(
          addresses, i, &r->addresses->addrs[i].addr,
          r->addresses->addrs[i].len, false /* is_balancer */,
          NULL /* balancer_name */, NULL /* user_data */);
    }
    grpc_arg new_arg = grpc_lb_addresses_create_channel_arg(addresses);
    result = grpc_channel_args_copy_and_add(r->channel_args, &new_arg, 1);
    grpc_resolved_addresses_destroy(r->addresses);
-    result = grpc_resolver_result_create(r->target_name, addresses,
+    grpc_lb_addresses_destroy(addresses);
                                         NULL /* lb_policy_name */, NULL);
  } else {
    gpr_timespec now = gpr_now(GPR_CLOCK_MONOTONIC);
    gpr_timespec next_try = gpr_backoff_step(&r->backoff_state, now);
@ -197,8 +199,8 @@ static void dns_on_resolved(grpc_exec_ctx *exec_ctx, void *arg,
    grpc_timer_init(exec_ctx, &r->retry_timer, next_try, dns_on_retry_timer, r,
                    now);
  }
-  if (r->resolved_result) {
+  if (r->resolved_result != NULL) {
-    grpc_resolver_result_unref(exec_ctx, r->resolved_result);
+    grpc_channel_args_destroy(r->resolved_result);
  }
  r->resolved_result = result;
  r->resolved_version++;
@ -222,10 +224,9 @@ static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
                                         dns_resolver *r) {
  if (r->next_completion != NULL &&
      r->resolved_version != r->published_version) {
-    *r->target_result = r->resolved_result;
+    *r->target_result = r->resolved_result == NULL
-    if (r->resolved_result) {
+                            ? NULL
-      grpc_resolver_result_ref(r->resolved_result);
+                            : grpc_channel_args_copy(r->resolved_result);
    }
    grpc_exec_ctx_sched(exec_ctx, r->next_completion, GRPC_ERROR_NONE, NULL);
    r->next_completion = NULL;
    r->published_version = r->resolved_version;
@ -235,12 +236,12 @@ static void dns_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 static void dns_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
  dns_resolver *r = (dns_resolver *)gr;
  gpr_mu_destroy(&r->mu);
-  if (r->resolved_result) {
+  if (r->resolved_result != NULL) {
-    grpc_resolver_result_unref(exec_ctx, r->resolved_result);
+    grpc_channel_args_destroy(r->resolved_result);
  }
  gpr_free(r->target_name);
  gpr_free(r->name_to_resolve);
  gpr_free(r->default_port);
  grpc_channel_args_destroy(r->channel_args);
  gpr_free(r);
 }
@ -260,9 +261,14 @@ static grpc_resolver *dns_create(grpc_resolver_args *args,
  memset(r, 0, sizeof(*r));
  gpr_mu_init(&r->mu);
  grpc_resolver_init(&r->base, &dns_resolver_vtable);
  r->target_name = gpr_strdup(path);
  r->name_to_resolve = proxy_name == NULL ? gpr_strdup(path) : proxy_name;
  r->default_port = gpr_strdup(default_port);
  grpc_arg server_name_arg;
  server_name_arg.type = GRPC_ARG_STRING;
  server_name_arg.key = GRPC_ARG_SERVER_NAME;
  server_name_arg.value.string = (char *)path;
  r->channel_args =
      grpc_channel_args_copy_and_add(args->args, &server_name_arg, 1);
  gpr_backoff_init(&r->backoff_state, BACKOFF_MULTIPLIER, BACKOFF_JITTER,
                   BACKOFF_MIN_SECONDS * 1000, BACKOFF_MAX_SECONDS * 1000);
  return &r->base;
--- a/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
+++ b/src/core/ext/resolver/sockaddr/sockaddr_resolver.c
@ -41,8 +41,10 @@
 #include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include "src/core/ext/client_channel/lb_policy_factory.h"
 #include "src/core/ext/client_channel/parse_address.h"
 #include "src/core/ext/client_channel/resolver_registry.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
 #include "src/core/lib/support/string.h"
@ -50,10 +52,10 @@
 typedef struct {
  /** base class: must be first */
  grpc_resolver base;
  /** the path component of the uri passed in */
  char *target_name;
  /** the addresses that we've 'resolved' */
  grpc_lb_addresses *addresses;
  /** channel args */
  grpc_channel_args *channel_args;
  /** mutex guarding the rest of the state */
  gpr_mu mu;
  /** have we published? */
@ -61,7 +63,7 @@ typedef struct {
  /** pending next completion, or NULL */
  grpc_closure *next_completion;
  /** target result address for next completion */
-  grpc_resolver_result **target_result;
+  grpc_channel_args **target_result;
 } sockaddr_resolver;
 static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *r);
@ -73,7 +75,7 @@ static void sockaddr_shutdown(grpc_exec_ctx *exec_ctx, grpc_resolver *r);
 static void sockaddr_channel_saw_error(grpc_exec_ctx *exec_ctx,
                                       grpc_resolver *r);
 static void sockaddr_next(grpc_exec_ctx *exec_ctx, grpc_resolver *r,
-                          grpc_resolver_result **target_result,
+                          grpc_channel_args **target_result,
                          grpc_closure *on_complete);
 static const grpc_resolver_vtable sockaddr_resolver_vtable = {
@ -102,7 +104,7 @@ static void sockaddr_channel_saw_error(grpc_exec_ctx *exec_ctx,
 }
 static void sockaddr_next(grpc_exec_ctx *exec_ctx, grpc_resolver *resolver,
-                          grpc_resolver_result **target_result,
+                          grpc_channel_args **target_result,
                          grpc_closure *on_complete) {
  sockaddr_resolver *r = (sockaddr_resolver *)resolver;
  gpr_mu_lock(&r->mu);
@ -117,10 +119,9 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
                                              sockaddr_resolver *r) {
  if (r->next_completion != NULL && !r->published) {
    r->published = true;
-    *r->target_result = grpc_resolver_result_create(
+    grpc_arg arg = grpc_lb_addresses_create_channel_arg(r->addresses);
-        r->target_name,
+    *r->target_result =
-        grpc_lb_addresses_copy(r->addresses, NULL /* user_data_copy */),
+        grpc_channel_args_copy_and_add(r->channel_args, &arg, 1);
        NULL /* lb_policy_name */, NULL /* lb_policy_args */);
    grpc_exec_ctx_sched(exec_ctx, r->next_completion, GRPC_ERROR_NONE, NULL);
    r->next_completion = NULL;
  }
@ -129,8 +130,8 @@ static void sockaddr_maybe_finish_next_locked(grpc_exec_ctx *exec_ctx,
 static void sockaddr_destroy(grpc_exec_ctx *exec_ctx, grpc_resolver *gr) {
  sockaddr_resolver *r = (sockaddr_resolver *)gr;
  gpr_mu_destroy(&r->mu);
-  gpr_free(r->target_name);
+  grpc_lb_addresses_destroy(r->addresses);
-  grpc_lb_addresses_destroy(r->addresses, NULL /* user_data_destroy */);
+  grpc_channel_args_destroy(r->channel_args);
  gpr_free(r);
 }
@ -150,7 +151,7 @@ static char *ipv6_get_default_authority(grpc_resolver_factory *factory,
  return ip_get_default_authority(uri);
 }
-#ifdef GPR_HAVE_UNIX_SOCKET
+#ifdef GRPC_HAVE_UNIX_SOCKET
 char *unix_get_default_authority(grpc_resolver_factory *factory,
                                 grpc_uri *uri) {
  return gpr_strdup("localhost");
@ -161,8 +162,7 @@ static void do_nothing(void *ignored) {}
 static grpc_resolver *sockaddr_create(grpc_resolver_args *args,
                                      int parse(grpc_uri *uri,
-                                                struct sockaddr_storage *dst,
+                                                grpc_resolved_address *dst)) {
                                                size_t *len)) {
  if (0 != strcmp(args->uri->authority, "")) {
    gpr_log(GPR_ERROR, "authority based uri's not supported by the %s scheme",
            args->uri->scheme);
@ -174,17 +174,15 @@ static grpc_resolver *sockaddr_create(grpc_resolver_args *args,
  gpr_slice_buffer path_parts;
  gpr_slice_buffer_init(&path_parts);
  gpr_slice_split(path_slice, ",", &path_parts);
-  grpc_lb_addresses *addresses = grpc_lb_addresses_create(path_parts.count);
+  grpc_lb_addresses *addresses =
      grpc_lb_addresses_create(path_parts.count, NULL /* user_data_vtable */);
  bool errors_found = false;
  for (size_t i = 0; i < addresses->num_addresses; i++) {
    grpc_uri ith_uri = *args->uri;
    char *part_str = gpr_dump_slice(path_parts.slices[i], GPR_DUMP_ASCII);
    ith_uri.path = part_str;
-    if (!parse(
+    if (!parse(&ith_uri, &addresses->addresses[i].address)) {
-            &ith_uri,
+      errors_found = true; /* GPR_TRUE */
            (struct sockaddr_storage *)(&addresses->addresses[i].address.addr),
            &addresses->addresses[i].address.len)) {
      errors_found = true;
    }
    gpr_free(part_str);
    if (errors_found) break;
@ -192,14 +190,19 @@ static grpc_resolver *sockaddr_create(grpc_resolver_args *args,
  gpr_slice_buffer_destroy(&path_parts);
  gpr_slice_unref(path_slice);
  if (errors_found) {
-    grpc_lb_addresses_destroy(addresses, NULL /* user_data_destroy */);
+    grpc_lb_addresses_destroy(addresses);
    return NULL;
  }
  /* Instantiate resolver. */
  sockaddr_resolver *r = gpr_malloc(sizeof(sockaddr_resolver));
  memset(r, 0, sizeof(*r));
  r->target_name = gpr_strdup(args->uri->path);
  r->addresses = addresses;
  grpc_arg server_name_arg;
  server_name_arg.type = GRPC_ARG_STRING;
  server_name_arg.key = GRPC_ARG_SERVER_NAME;
  server_name_arg.value.string = args->uri->path;
  r->channel_args =
      grpc_channel_args_copy_and_add(args->args, &server_name_arg, 1);
  gpr_mu_init(&r->mu);
  grpc_resolver_init(&r->base, &sockaddr_resolver_vtable);
  return &r->base;
@ -224,7 +227,7 @@ static void sockaddr_factory_unref(grpc_resolver_factory *factory) {}
  static grpc_resolver_factory name##_resolver_factory = {                  \
      &name##_factory_vtable}
-#ifdef GPR_HAVE_UNIX_SOCKET
+#ifdef GRPC_HAVE_UNIX_SOCKET
 DECL_FACTORY(unix);
 #endif
 DECL_FACTORY(ipv4);
@ -233,7 +236,7 @@ DECL_FACTORY(ipv6);
 void grpc_resolver_sockaddr_init(void) {
  grpc_register_resolver_type(&ipv4_resolver_factory);
  grpc_register_resolver_type(&ipv6_resolver_factory);
-#ifdef GPR_HAVE_UNIX_SOCKET
+#ifdef GRPC_HAVE_UNIX_SOCKET
  grpc_register_resolver_type(&unix_resolver_factory);
 #endif
 }
--- a/src/core/ext/transport/chttp2/alpn/alpn.c
+++ b/src/core/ext/transport/chttp2/alpn/alpn.c
@ -36,7 +36,7 @@
 #include <grpc/support/useful.h>
 /* in order of preference */
-static const char *const supported_versions[] = {"h2"};
+static const char *const supported_versions[] = {"grpc-exp", "h2"};
 int grpc_chttp2_is_alpn_version_supported(const char *version, size_t size) {
  size_t i;
--- a/src/core/ext/transport/chttp2/client/insecure/channel_create.c
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create.c
@ -52,6 +52,10 @@
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/channel.h"
 //
 // connector
 //
 typedef struct {
  grpc_connector base;
  gpr_refcount refs;
@ -150,42 +154,27 @@ static void connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *con,
  c->tcp = NULL;
  grpc_closure_init(&c->connected, connected, c);
  grpc_tcp_client_connect(exec_ctx, &c->connected, &c->tcp,
-                          args->interested_parties, args->addr, args->addr_len,
+                          args->interested_parties, args->channel_args,
-                          args->deadline);
+                          args->addr, args->deadline);
 }
 static const grpc_connector_vtable connector_vtable = {
    connector_ref, connector_unref, connector_shutdown, connector_connect};
-typedef struct {
+//
-  grpc_client_channel_factory base;
+// client_channel_factory
-  gpr_refcount refs;
+//
  grpc_channel_args *merge_args;
 } client_channel_factory;
 static void client_channel_factory_ref(
-    grpc_client_channel_factory *cc_factory) {
+    grpc_client_channel_factory *cc_factory) {}
  client_channel_factory *f = (client_channel_factory *)cc_factory;
  gpr_ref(&f->refs);
 }
 static void client_channel_factory_unref(
-    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {
+    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory) {}
  client_channel_factory *f = (client_channel_factory *)cc_factory;
  if (gpr_unref(&f->refs)) {
    grpc_channel_args_destroy(f->merge_args);
    gpr_free(f);
  }
 }
 static grpc_subchannel *client_channel_factory_create_subchannel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
-    grpc_subchannel_args *args) {
+    const grpc_subchannel_args *args) {
  client_channel_factory *f = (client_channel_factory *)cc_factory;
  connector *c = gpr_malloc(sizeof(*c));
  grpc_channel_args *final_args =
      grpc_channel_args_merge(args->args, f->merge_args);
  grpc_subchannel *s;
  memset(c, 0, sizeof(*c));
  c->base.vtable = &connector_vtable;
  gpr_ref_init(&c->refs, 1);
@ -197,23 +186,18 @@ static grpc_subchannel *client_channel_factory_create_subchannel(
        grpc_http_connect_handshaker_create(proxy_name, args->server_name));
    gpr_free(proxy_name);
  }
-  args->args = final_args;
+  grpc_subchannel *s = grpc_subchannel_create(exec_ctx, &c->base, args);
  s = grpc_subchannel_create(exec_ctx, &c->base, args);
  grpc_connector_unref(exec_ctx, &c->base);
  grpc_channel_args_destroy(final_args);
  return s;
 }
 static grpc_channel *client_channel_factory_create_channel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
    const char *target, grpc_client_channel_type type,
-    grpc_channel_args *args) {
+    const grpc_channel_args *args) {
-  client_channel_factory *f = (client_channel_factory *)cc_factory;
+  grpc_channel *channel =
-  grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
+      grpc_channel_create(exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL);
-  grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
+  grpc_resolver *resolver = grpc_resolver_create(target, args);
                                              GRPC_CLIENT_CHANNEL, NULL);
  grpc_channel_args_destroy(final_args);
  grpc_resolver *resolver = grpc_resolver_create(target);
  if (!resolver) {
    GRPC_CHANNEL_INTERNAL_UNREF(exec_ctx, channel,
                                "client_channel_factory_create_channel");
@ -221,7 +205,7 @@ static grpc_channel *client_channel_factory_create_channel(
  }
  grpc_client_channel_finish_initialization(
-      exec_ctx, grpc_channel_get_channel_stack(channel), resolver, &f->base);
+      exec_ctx, grpc_channel_get_channel_stack(channel), resolver, cc_factory);
  GRPC_RESOLVER_UNREF(exec_ctx, resolver, "create_channel");
  return channel;
@ -232,6 +216,9 @@ static const grpc_client_channel_factory_vtable client_channel_factory_vtable =
     client_channel_factory_create_subchannel,
     client_channel_factory_create_channel};
 static grpc_client_channel_factory client_channel_factory = {
    &client_channel_factory_vtable};
 /* Create a client channel:
   Asynchronously: - resolve target
                   - connect to it (trying alternatives as presented)
@ -245,16 +232,12 @@ grpc_channel *grpc_insecure_channel_create(const char *target,
      (target, args, reserved));
  GPR_ASSERT(!reserved);
-  client_channel_factory *f = gpr_malloc(sizeof(*f));
+  grpc_client_channel_factory *factory =
-  memset(f, 0, sizeof(*f));
+      (grpc_client_channel_factory *)&client_channel_factory;
  f->base.vtable = &client_channel_factory_vtable;
  gpr_ref_init(&f->refs, 1);
  f->merge_args = grpc_channel_args_copy(args);
  grpc_channel *channel = client_channel_factory_create_channel(
-      &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
+      &exec_ctx, factory, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, args);
-  grpc_client_channel_factory_unref(&exec_ctx, &f->base);
+  grpc_client_channel_factory_unref(&exec_ctx, factory);
  grpc_exec_ctx_finish(&exec_ctx);
  return channel != NULL ? channel : grpc_lame_client_channel_create(
--- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
+++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.c
@ -44,6 +44,7 @@
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/tcp_client_posix.h"
 #include "src/core/lib/iomgr/tcp_posix.h"
 #include "src/core/lib/surface/api_trace.h"
 #include "src/core/lib/surface/channel.h"
@ -65,9 +66,8 @@ grpc_channel *grpc_insecure_channel_create_from_fd(
  int flags = fcntl(fd, F_GETFL, 0);
  GPR_ASSERT(fcntl(fd, F_SETFL, flags | O_NONBLOCK) == 0);
-  grpc_endpoint *client =
+  grpc_endpoint *client = grpc_tcp_client_create_from_fd(
-      grpc_tcp_create(grpc_fd_create(fd, "client"),
+      &exec_ctx, grpc_fd_create(fd, "client"), args, "fd-client");
                      GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "fd-client");
  grpc_transport *transport =
      grpc_create_chttp2_transport(&exec_ctx, final_args, client, 1);
--- a/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
+++ b/src/core/ext/transport/chttp2/client/secure/secure_channel_create.c
@ -54,6 +54,10 @@
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/tsi/transport_security_interface.h"
 //
 // connector
 //
 typedef struct {
  grpc_connector base;
  gpr_refcount refs;
@ -210,16 +214,19 @@ static void connector_connect(grpc_exec_ctx *exec_ctx, grpc_connector *con,
  grpc_closure_init(&c->connected_closure, connected, c);
  grpc_tcp_client_connect(
      exec_ctx, &c->connected_closure, &c->newly_connecting_endpoint,
-      args->interested_parties, args->addr, args->addr_len, args->deadline);
+      args->interested_parties, args->channel_args, args->addr, args->deadline);
 }
 static const grpc_connector_vtable connector_vtable = {
    connector_ref, connector_unref, connector_shutdown, connector_connect};
 //
 // client_channel_factory
 //
 typedef struct {
  grpc_client_channel_factory base;
  gpr_refcount refs;
  grpc_channel_args *merge_args;
  grpc_channel_security_connector *security_connector;
 } client_channel_factory;
@ -235,19 +242,15 @@ static void client_channel_factory_unref(
  if (gpr_unref(&f->refs)) {
    GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
                                  "client_channel_factory");
    grpc_channel_args_destroy(f->merge_args);
    gpr_free(f);
  }
 }
 static grpc_subchannel *client_channel_factory_create_subchannel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
-    grpc_subchannel_args *args) {
+    const grpc_subchannel_args *args) {
  client_channel_factory *f = (client_channel_factory *)cc_factory;
  connector *c = gpr_malloc(sizeof(*c));
  grpc_channel_args *final_args =
      grpc_channel_args_merge(args->args, f->merge_args);
  grpc_subchannel *s;
  memset(c, 0, sizeof(*c));
  c->base.vtable = &connector_vtable;
  c->security_connector = f->security_connector;
@ -261,25 +264,19 @@ static grpc_subchannel *client_channel_factory_create_subchannel(
  }
  gpr_mu_init(&c->mu);
  gpr_ref_init(&c->refs, 1);
-  args->args = final_args;
+  grpc_subchannel *s = grpc_subchannel_create(exec_ctx, &c->base, args);
  s = grpc_subchannel_create(exec_ctx, &c->base, args);
  grpc_connector_unref(exec_ctx, &c->base);
  grpc_channel_args_destroy(final_args);
  return s;
 }
 static grpc_channel *client_channel_factory_create_channel(
    grpc_exec_ctx *exec_ctx, grpc_client_channel_factory *cc_factory,
    const char *target, grpc_client_channel_type type,
-    grpc_channel_args *args) {
+    const grpc_channel_args *args) {
  client_channel_factory *f = (client_channel_factory *)cc_factory;
-
+  grpc_channel *channel =
-  grpc_channel_args *final_args = grpc_channel_args_merge(args, f->merge_args);
+      grpc_channel_create(exec_ctx, target, args, GRPC_CLIENT_CHANNEL, NULL);
-  grpc_channel *channel = grpc_channel_create(exec_ctx, target, final_args,
+  grpc_resolver *resolver = grpc_resolver_create(target, args);
                                              GRPC_CLIENT_CHANNEL, NULL);
  grpc_channel_args_destroy(final_args);
  grpc_resolver *resolver = grpc_resolver_create(target);
  if (resolver != NULL) {
    grpc_client_channel_finish_initialization(
        exec_ctx, grpc_channel_get_channel_stack(channel), resolver, &f->base);
@ -289,7 +286,6 @@ static grpc_channel *client_channel_factory_create_channel(
                                "client_channel_factory_create_channel");
    channel = NULL;
  }
  return channel;
 }
@ -306,19 +302,13 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
                                         const char *target,
                                         const grpc_channel_args *args,
                                         void *reserved) {
  grpc_arg connector_arg;
  grpc_channel_args *args_copy;
  grpc_channel_args *new_args_from_connector;
  grpc_channel_security_connector *security_connector;
  client_channel_factory *f;
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
  GRPC_API_TRACE(
      "grpc_secure_channel_create(creds=%p, target=%s, args=%p, "
      "reserved=%p)",
      4, (creds, target, args, reserved));
  GPR_ASSERT(reserved == NULL);
-
+  // Make sure security connector does not already exist in args.
  if (grpc_find_security_connector_in_args(args) != NULL) {
    gpr_log(GPR_ERROR, "Cannot set security context in channel args.");
    grpc_exec_ctx_finish(&exec_ctx);
@ -326,7 +316,9 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
        target, GRPC_STATUS_INTERNAL,
        "Security connector exists in channel args.");
  }
-
+  // Create security connector and construct new channel args.
  grpc_channel_security_connector *security_connector;
  grpc_channel_args *new_args_from_connector;
  if (grpc_channel_credentials_create_security_connector(
          creds, target, args, &security_connector, &new_args_from_connector) !=
      GRPC_SECURITY_OK) {
@ -334,35 +326,30 @@ grpc_channel *grpc_secure_channel_create(grpc_channel_credentials *creds,
    return grpc_lame_client_channel_create(
        target, GRPC_STATUS_INTERNAL, "Failed to create security connector.");
  }
-
+  grpc_arg connector_arg =
-  connector_arg = grpc_security_connector_to_arg(&security_connector->base);
+      grpc_security_connector_to_arg(&security_connector->base);
-  args_copy = grpc_channel_args_copy_and_add(
+  grpc_channel_args *new_args = grpc_channel_args_copy_and_add(
      new_args_from_connector != NULL ? new_args_from_connector : args,
      &connector_arg, 1);
  f = gpr_malloc(sizeof(*f));
  memset(f, 0, sizeof(*f));
  f->base.vtable = &client_channel_factory_vtable;
  gpr_ref_init(&f->refs, 1);
  f->merge_args = grpc_channel_args_copy(args_copy);
  grpc_channel_args_destroy(args_copy);
  if (new_args_from_connector != NULL) {
    grpc_channel_args_destroy(new_args_from_connector);
  }
-
+  // Create client channel factory.
  client_channel_factory *f = gpr_malloc(sizeof(*f));
  memset(f, 0, sizeof(*f));
  f->base.vtable = &client_channel_factory_vtable;
  gpr_ref_init(&f->refs, 1);
  GRPC_SECURITY_CONNECTOR_REF(&security_connector->base,
                              "grpc_secure_channel_create");
  f->security_connector = security_connector;
-
+  // Create channel.
  grpc_channel *channel = client_channel_factory_create_channel(
-      &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, NULL);
+      &exec_ctx, &f->base, target, GRPC_CLIENT_CHANNEL_TYPE_REGULAR, new_args);
-
+  // Clean up.
  GRPC_SECURITY_CONNECTOR_UNREF(&f->security_connector->base,
                                "client_channel_factory_create_channel");
-
+  grpc_channel_args_destroy(new_args);
  grpc_client_channel_factory_unref(&exec_ctx, &f->base);
  grpc_exec_ctx_finish(&exec_ctx);
  return channel; /* may be NULL */
 }
--- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
+++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
@ -139,8 +139,8 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
    goto error;
  }
-  err =
+  err = grpc_tcp_server_create(&exec_ctx, NULL,
-      grpc_tcp_server_create(NULL, grpc_server_get_channel_args(server), &tcp);
+                               grpc_server_get_channel_args(server), &tcp);
  if (err != GRPC_ERROR_NONE) {
    goto error;
  }
@ -148,9 +148,7 @@ int grpc_server_add_insecure_http2_port(grpc_server *server, const char *addr) {
  const size_t naddrs = resolved->naddrs;
  errors = gpr_malloc(sizeof(*errors) * naddrs);
  for (i = 0; i < naddrs; i++) {
-    errors[i] = grpc_tcp_server_add_port(
+    errors[i] = grpc_tcp_server_add_port(tcp, &resolved->addrs[i], &port_temp);
        tcp, (struct sockaddr *)&resolved->addrs[i].addr,
        resolved->addrs[i].len, &port_temp);
    if (errors[i] == GRPC_ERROR_NONE) {
      if (port_num == -1) {
        port_num = port_temp;
--- a/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c
+++ b/src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c
@ -57,8 +57,12 @@ void grpc_server_add_insecure_channel_from_fd(grpc_server *server,
  char *name;
  gpr_asprintf(&name, "fd:%d", fd);
-  grpc_endpoint *server_endpoint = grpc_tcp_create(
+  grpc_resource_quota *resource_quota = grpc_resource_quota_from_channel_args(
-      grpc_fd_create(fd, name), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, name);
+      grpc_server_get_channel_args(server));
  grpc_endpoint *server_endpoint =
      grpc_tcp_create(grpc_fd_create(fd, name), resource_quota,
                      GRPC_TCP_DEFAULT_READ_SLICE_SIZE, name);
  grpc_resource_quota_internal_unref(&exec_ctx, resource_quota);
  gpr_free(name);
--- a/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
+++ b/src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.c
@ -271,7 +271,8 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr,
  memset(server_state, 0, sizeof(*server_state));
  grpc_closure_init(&server_state->tcp_server_shutdown_complete,
                    tcp_server_shutdown_complete, server_state);
-  err = grpc_tcp_server_create(&server_state->tcp_server_shutdown_complete,
+  err = grpc_tcp_server_create(&exec_ctx,
                               &server_state->tcp_server_shutdown_complete,
                               grpc_server_get_channel_args(server), &tcp);
  if (err != GRPC_ERROR_NONE) {
    goto error;
@ -286,9 +287,7 @@ int grpc_server_add_secure_http2_port(grpc_server *server, const char *addr,
  errors = gpr_malloc(sizeof(*errors) * resolved->naddrs);
  for (i = 0; i < resolved->naddrs; i++) {
-    errors[i] = grpc_tcp_server_add_port(
+    errors[i] = grpc_tcp_server_add_port(tcp, &resolved->addrs[i], &port_temp);
        tcp, (struct sockaddr *)&resolved->addrs[i].addr,
        resolved->addrs[i].len, &port_temp);
    if (errors[i] == GRPC_ERROR_NONE) {
      if (port_num == -1) {
        port_num = port_temp;
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.c
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.c
@ -114,6 +114,20 @@ static void fail_pending_writes(grpc_exec_ctx *exec_ctx,
                                grpc_chttp2_transport *t, grpc_chttp2_stream *s,
                                grpc_error *error);
 static void benign_reclaimer(grpc_exec_ctx *exec_ctx, void *t,
                             grpc_error *error);
 static void benign_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *t,
                                    grpc_error *error);
 static void destructive_reclaimer(grpc_exec_ctx *exec_ctx, void *t,
                                  grpc_error *error);
 static void destructive_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *t,
                                         grpc_error *error);
 static void post_benign_reclaimer(grpc_exec_ctx *exec_ctx,
                                  grpc_chttp2_transport *t);
 static void post_destructive_reclaimer(grpc_exec_ctx *exec_ctx,
                                       grpc_chttp2_transport *t);
 static void close_transport_locked(grpc_exec_ctx *exec_ctx,
                                   grpc_chttp2_transport *t, grpc_error *error);
 static void end_all_the_calls(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
@ -241,6 +255,11 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
  grpc_closure_init(&t->write_action_end_locked, write_action_end_locked, t);
  grpc_closure_init(&t->read_action_begin, read_action_begin, t);
  grpc_closure_init(&t->read_action_locked, read_action_locked, t);
  grpc_closure_init(&t->benign_reclaimer, benign_reclaimer, t);
  grpc_closure_init(&t->destructive_reclaimer, destructive_reclaimer, t);
  grpc_closure_init(&t->benign_reclaimer_locked, benign_reclaimer_locked, t);
  grpc_closure_init(&t->destructive_reclaimer_locked,
                    destructive_reclaimer_locked, t);
  grpc_chttp2_goaway_parser_init(&t->goaway_parser);
  grpc_chttp2_hpack_parser_init(&t->hpack_parser);
@ -362,6 +381,7 @@ static void init_transport(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
  }
  grpc_chttp2_initiate_write(exec_ctx, t, false, "init");
  post_benign_reclaimer(exec_ctx, t);
 }
 static void destroy_transport_locked(grpc_exec_ctx *exec_ctx, void *tp,
@ -467,6 +487,7 @@ static int init_stream(grpc_exec_ctx *exec_ctx, grpc_transport *gt,
                   [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE];
    *t->accepting_stream = s;
    grpc_chttp2_stream_map_add(&t->stream_map, s->id, s);
    post_destructive_reclaimer(exec_ctx, t);
  }
  GPR_TIMER_END("init_stream", 0);
@ -675,6 +696,13 @@ static void write_action_end_locked(grpc_exec_ctx *exec_ctx, void *tp,
    close_transport_locked(exec_ctx, t, GRPC_ERROR_REF(error));
  }
  if (t->sent_goaway_state == GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED) {
    t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SENT;
    if (grpc_chttp2_stream_map_size(&t->stream_map) == 0) {
      close_transport_locked(exec_ctx, t, GRPC_ERROR_CREATE("goaway sent"));
    }
  }
  grpc_chttp2_end_write(exec_ctx, t, GRPC_ERROR_REF(error));
  switch (t->write_state) {
@ -780,6 +808,7 @@ static void maybe_start_some_streams(grpc_exec_ctx *exec_ctx,
                   [GRPC_CHTTP2_SETTINGS_INITIAL_WINDOW_SIZE];
    s->max_recv_bytes = GPR_MAX(stream_incoming_window, s->max_recv_bytes);
    grpc_chttp2_stream_map_add(&t->stream_map, s->id, s);
    post_destructive_reclaimer(exec_ctx, t);
    grpc_chttp2_become_writable(exec_ctx, t, s, true, "new_stream");
  }
  /* cancel out streams that will never be started */
@ -993,9 +1022,14 @@ static void perform_stream_op_locked(grpc_exec_ctx *exec_ctx, void *stream_op,
      }
      if (!s->write_closed) {
        if (t->is_client) {
-          GPR_ASSERT(s->id == 0);
+          if (!t->closed) {
-          grpc_chttp2_list_add_waiting_for_concurrency(t, s);
+            GPR_ASSERT(s->id == 0);
-          maybe_start_some_streams(exec_ctx, t);
+            grpc_chttp2_list_add_waiting_for_concurrency(t, s);
            maybe_start_some_streams(exec_ctx, t);
          } else {
            grpc_chttp2_cancel_stream(exec_ctx, t, s,
                                      GRPC_ERROR_CREATE("Transport closed"));
          }
        } else {
          GPR_ASSERT(s->id != 0);
          grpc_chttp2_become_writable(exec_ctx, t, s, true,
@ -1185,6 +1219,14 @@ void grpc_chttp2_ack_ping(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
  gpr_free(msg);
 }
 static void send_goaway(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
                        grpc_chttp2_error_code error, gpr_slice data) {
  t->sent_goaway_state = GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED;
  grpc_chttp2_goaway_append(t->last_new_stream_id, (uint32_t)error, data,
                            &t->qbuf);
  grpc_chttp2_initiate_write(exec_ctx, t, false, "goaway_sent");
 }
 static void perform_transport_op_locked(grpc_exec_ctx *exec_ctx,
                                        void *stream_op,
                                        grpc_error *error_ignored) {
@ -1199,15 +1241,9 @@ static void perform_transport_op_locked(grpc_exec_ctx *exec_ctx,
  }
  if (op->send_goaway) {
-    t->sent_goaway = 1;
+    send_goaway(exec_ctx, t,
-    grpc_chttp2_goaway_append(
+                grpc_chttp2_grpc_status_to_http2_error(op->goaway_status),
-        t->last_new_stream_id,
+                gpr_slice_ref(*op->goaway_message));
        (uint32_t)grpc_chttp2_grpc_status_to_http2_error(op->goaway_status),
        gpr_slice_ref(*op->goaway_message), &t->qbuf);
    close_transport = grpc_chttp2_stream_map_size(&t->stream_map) == 0
                          ? GRPC_ERROR_CREATE("GOAWAY sent")
                          : GRPC_ERROR_NONE;
    grpc_chttp2_initiate_write(exec_ctx, t, false, "goaway_sent");
  }
  if (op->set_accept_stream) {
@ -1341,10 +1377,14 @@ static void remove_stream(grpc_exec_ctx *exec_ctx, grpc_chttp2_transport *t,
    s->data_parser.parsing_frame = NULL;
  }
-  if (grpc_chttp2_stream_map_size(&t->stream_map) == 0 && t->sent_goaway) {
+  if (grpc_chttp2_stream_map_size(&t->stream_map) == 0) {
-    close_transport_locked(
+    post_benign_reclaimer(exec_ctx, t);
-        exec_ctx, t, GRPC_ERROR_CREATE_REFERENCING(
+    if (t->sent_goaway_state == GRPC_CHTTP2_GOAWAY_SENT) {
-                         "Last stream closed after sending GOAWAY", &error, 1));
+      close_transport_locked(
          exec_ctx, t,
          GRPC_ERROR_CREATE_REFERENCING(
              "Last stream closed after sending GOAWAY", &error, 1));
    }
  }
  if (grpc_chttp2_list_remove_writable_stream(t, s)) {
    GRPC_CHTTP2_STREAM_UNREF(exec_ctx, s, "chttp2_writing:remove_stream");
@ -2071,6 +2111,103 @@ grpc_chttp2_incoming_byte_stream *grpc_chttp2_incoming_byte_stream_create(
  return incoming_byte_stream;
 }
 /*******************************************************************************
 * RESOURCE QUOTAS
 */
 static void post_benign_reclaimer(grpc_exec_ctx *exec_ctx,
                                  grpc_chttp2_transport *t) {
  if (!t->benign_reclaimer_registered) {
    t->benign_reclaimer_registered = true;
    GRPC_CHTTP2_REF_TRANSPORT(t, "benign_reclaimer");
    grpc_resource_user_post_reclaimer(exec_ctx,
                                      grpc_endpoint_get_resource_user(t->ep),
                                      false, &t->benign_reclaimer);
  }
 }
 static void post_destructive_reclaimer(grpc_exec_ctx *exec_ctx,
                                       grpc_chttp2_transport *t) {
  if (!t->destructive_reclaimer_registered) {
    t->destructive_reclaimer_registered = true;
    GRPC_CHTTP2_REF_TRANSPORT(t, "destructive_reclaimer");
    grpc_resource_user_post_reclaimer(exec_ctx,
                                      grpc_endpoint_get_resource_user(t->ep),
                                      true, &t->destructive_reclaimer);
  }
 }
 static void benign_reclaimer(grpc_exec_ctx *exec_ctx, void *arg,
                             grpc_error *error) {
  grpc_chttp2_transport *t = arg;
  grpc_combiner_execute(exec_ctx, t->combiner, &t->benign_reclaimer_locked,
                        GRPC_ERROR_REF(error), false);
 }
 static void destructive_reclaimer(grpc_exec_ctx *exec_ctx, void *arg,
                                  grpc_error *error) {
  grpc_chttp2_transport *t = arg;
  grpc_combiner_execute(exec_ctx, t->combiner, &t->destructive_reclaimer_locked,
                        GRPC_ERROR_REF(error), false);
 }
 static void benign_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg,
                                    grpc_error *error) {
  grpc_chttp2_transport *t = arg;
  if (error == GRPC_ERROR_NONE &&
      grpc_chttp2_stream_map_size(&t->stream_map) == 0) {
    /* Channel with no active streams: send a goaway to try and make it
     * disconnect cleanly */
    if (grpc_resource_quota_trace) {
      gpr_log(GPR_DEBUG, "HTTP2: %s - send goaway to free memory",
              t->peer_string);
    }
    send_goaway(exec_ctx, t, GRPC_CHTTP2_ENHANCE_YOUR_CALM,
                gpr_slice_from_static_string("Buffers full"));
  } else if (error == GRPC_ERROR_NONE && grpc_resource_quota_trace) {
    gpr_log(GPR_DEBUG,
            "HTTP2: %s - skip benign reclamation, there are still %" PRIdPTR
            " streams",
            t->peer_string, grpc_chttp2_stream_map_size(&t->stream_map));
  }
  t->benign_reclaimer_registered = false;
  if (error != GRPC_ERROR_CANCELLED) {
    grpc_resource_user_finish_reclamation(
        exec_ctx, grpc_endpoint_get_resource_user(t->ep));
  }
  GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "benign_reclaimer");
 }
 static void destructive_reclaimer_locked(grpc_exec_ctx *exec_ctx, void *arg,
                                         grpc_error *error) {
  grpc_chttp2_transport *t = arg;
  size_t n = grpc_chttp2_stream_map_size(&t->stream_map);
  t->destructive_reclaimer_registered = false;
  if (error == GRPC_ERROR_NONE && n > 0) {
    grpc_chttp2_stream *s = grpc_chttp2_stream_map_rand(&t->stream_map);
    if (grpc_resource_quota_trace) {
      gpr_log(GPR_DEBUG, "HTTP2: %s - abandon stream id %d", t->peer_string,
              s->id);
    }
    grpc_chttp2_cancel_stream(
        exec_ctx, t, s, grpc_error_set_int(GRPC_ERROR_CREATE("Buffers full"),
                                           GRPC_ERROR_INT_HTTP2_ERROR,
                                           GRPC_CHTTP2_ENHANCE_YOUR_CALM));
    if (n > 1) {
      /* Since we cancel one stream per destructive reclamation, if
         there are more streams left, we can immediately post a new
         reclaimer in case the resource quota needs to free more
         memory */
      post_destructive_reclaimer(exec_ctx, t);
    }
  }
  if (error != GRPC_ERROR_CANCELLED) {
    grpc_resource_user_finish_reclamation(
        exec_ctx, grpc_endpoint_get_resource_user(t->ep));
  }
  GRPC_CHTTP2_UNREF_TRANSPORT(exec_ctx, t, "destructive_reclaimer");
 }
 /*******************************************************************************
 * TRACING
 */
--- a/src/core/ext/transport/chttp2/transport/internal.h
+++ b/src/core/ext/transport/chttp2/transport/internal.h
@ -138,6 +138,12 @@ typedef enum {
  GRPC_NUM_SETTING_SETS
 } grpc_chttp2_setting_set;
 typedef enum {
  GRPC_CHTTP2_NO_GOAWAY_SEND,
  GRPC_CHTTP2_GOAWAY_SEND_SCHEDULED,
  GRPC_CHTTP2_GOAWAY_SENT,
 } grpc_chttp2_sent_goaway_state;
 /* Outstanding ping request data */
 typedef struct grpc_chttp2_outstanding_ping {
  uint8_t id[8];
@ -249,7 +255,7 @@ struct grpc_chttp2_transport {
  /** have we seen a goaway */
  uint8_t seen_goaway;
  /** have we sent a goaway */
-  uint8_t sent_goaway;
+  grpc_chttp2_sent_goaway_state sent_goaway_state;
  /** are the local settings dirty and need to be sent? */
  uint8_t dirtied_local_settings;
@ -320,6 +326,18 @@ struct grpc_chttp2_transport {
  /* if non-NULL, close the transport with this error when writes are finished
   */
  grpc_error *close_transport_on_writes_finished;
  /* buffer pool state */
  /** have we scheduled a benign cleanup? */
  bool benign_reclaimer_registered;
  /** have we scheduled a destructive cleanup? */
  bool destructive_reclaimer_registered;
  /** benign cleanup closure */
  grpc_closure benign_reclaimer;
  grpc_closure benign_reclaimer_locked;
  /** destructive cleanup closure */
  grpc_closure destructive_reclaimer;
  grpc_closure destructive_reclaimer_locked;
 };
 typedef enum {
--- a/src/core/ext/transport/chttp2/transport/stream_map.c
+++ b/src/core/ext/transport/chttp2/transport/stream_map.c
@ -151,6 +151,17 @@ size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map) {
  return map->count - map->free;
 }
 void *grpc_chttp2_stream_map_rand(grpc_chttp2_stream_map *map) {
  if (map->count == map->free) {
    return NULL;
  }
  if (map->free != 0) {
    map->count = compact(map->keys, map->values, map->count);
    map->free = 0;
  }
  return map->values[((size_t)rand()) % map->count];
 }
 void grpc_chttp2_stream_map_for_each(grpc_chttp2_stream_map *map,
                                     void (*f)(void *user_data, uint32_t key,
                                               void *value),
--- a/src/core/ext/transport/chttp2/transport/stream_map.h
+++ b/src/core/ext/transport/chttp2/transport/stream_map.h
@ -68,6 +68,9 @@ void *grpc_chttp2_stream_map_delete(grpc_chttp2_stream_map *map, uint32_t key);
 /* Return an existing key, or NULL if it does not exist */
 void *grpc_chttp2_stream_map_find(grpc_chttp2_stream_map *map, uint32_t key);
 /* Return a random entry */
 void *grpc_chttp2_stream_map_rand(grpc_chttp2_stream_map *map);
 /* How many (populated) entries are in the stream map? */
 size_t grpc_chttp2_stream_map_size(grpc_chttp2_stream_map *map);
--- a/src/core/lib/channel/channel_args.c
+++ b/src/core/lib/channel/channel_args.c
@ -66,22 +66,59 @@ static grpc_arg copy_arg(const grpc_arg *src) {
 grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
                                                  const grpc_arg *to_add,
                                                  size_t num_to_add) {
  return grpc_channel_args_copy_and_add_and_remove(src, NULL, 0, to_add,
                                                   num_to_add);
 }
 grpc_channel_args *grpc_channel_args_copy_and_remove(
    const grpc_channel_args *src, const char **to_remove,
    size_t num_to_remove) {
  return grpc_channel_args_copy_and_add_and_remove(src, to_remove,
                                                   num_to_remove, NULL, 0);
 }
 static bool should_remove_arg(const grpc_arg *arg, const char **to_remove,
                              size_t num_to_remove) {
  for (size_t i = 0; i < num_to_remove; ++i) {
    if (strcmp(arg->key, to_remove[i]) == 0) return true;
  }
  return false;
 }
 grpc_channel_args *grpc_channel_args_copy_and_add_and_remove(
    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove,
    const grpc_arg *to_add, size_t num_to_add) {
  // Figure out how many args we'll be copying.
  size_t num_args_to_copy = 0;
  if (src != NULL) {
    for (size_t i = 0; i < src->num_args; ++i) {
      if (!should_remove_arg(&src->args[i], to_remove, num_to_remove)) {
        ++num_args_to_copy;
      }
    }
  }
  // Create result.
  grpc_channel_args *dst = gpr_malloc(sizeof(grpc_channel_args));
-  size_t i;
+  dst->num_args = num_args_to_copy + num_to_add;
-  size_t src_num_args = (src == NULL) ? 0 : src->num_args;
+  if (dst->num_args == 0) {
  if (!src && !to_add) {
    dst->num_args = 0;
    dst->args = NULL;
    return dst;
  }
  dst->num_args = src_num_args + num_to_add;
  dst->args = gpr_malloc(sizeof(grpc_arg) * dst->num_args);
-  for (i = 0; i < src_num_args; i++) {
+  // Copy args from src that are not being removed.
-    dst->args[i] = copy_arg(&src->args[i]);
+  size_t dst_idx = 0;
  if (src != NULL) {
    for (size_t i = 0; i < src->num_args; ++i) {
      if (!should_remove_arg(&src->args[i], to_remove, num_to_remove)) {
        dst->args[dst_idx++] = copy_arg(&src->args[i]);
      }
    }
  }
-  for (i = 0; i < num_to_add; i++) {
+  // Add args from to_add.
-    dst->args[i + src_num_args] = copy_arg(&to_add[i]);
+  for (size_t i = 0; i < num_to_add; ++i) {
    dst->args[dst_idx++] = copy_arg(&to_add[i]);
  }
  GPR_ASSERT(dst_idx == dst->num_args);
  return dst;
 }
--- a/src/core/lib/channel/channel_args.h
+++ b/src/core/lib/channel/channel_args.h
@ -51,6 +51,17 @@ grpc_channel_args *grpc_channel_args_copy_and_add(const grpc_channel_args *src,
                                                  const grpc_arg *to_add,
                                                  size_t num_to_add);
 /** Copies the arguments in \a src except for those whose keys are in
    \a to_remove. */
 grpc_channel_args *grpc_channel_args_copy_and_remove(
    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove);
 /** Copies the arguments from \a src except for those whose keys are in
    \a to_remove and appends the arguments in \a to_add. */
 grpc_channel_args *grpc_channel_args_copy_and_add_and_remove(
    const grpc_channel_args *src, const char **to_remove, size_t num_to_remove,
    const grpc_arg *to_add, size_t num_to_add);
 /** Concatenate args from \a a and \a b into a new instance */
 grpc_channel_args *grpc_channel_args_merge(const grpc_channel_args *a,
                                           const grpc_channel_args *b);
--- a/src/core/lib/channel/message_size_filter.c
+++ b/src/core/lib/channel/message_size_filter.c
@ -38,8 +38,8 @@
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 #include "src/core/ext/client_channel/method_config.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/method_config.h"
 #define DEFAULT_MAX_SEND_MESSAGE_LENGTH -1  // Unlimited.
 // The protobuf library will (by default) start warning at 100 megs.
--- a/src/core/lib/http/httpcli.c
+++ b/src/core/lib/http/httpcli.c
@ -32,7 +32,6 @@
 */
 #include "src/core/lib/http/httpcli.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include <string.h>
@ -71,6 +70,7 @@ typedef struct {
  grpc_closure done_write;
  grpc_closure connected;
  grpc_error *overall_error;
  grpc_resource_quota *resource_quota;
 } internal_request;
 static grpc_httpcli_get_override g_get_override = NULL;
@ -118,6 +118,7 @@ static void finish(grpc_exec_ctx *exec_ctx, internal_request *req,
  gpr_slice_buffer_destroy(&req->incoming);
  gpr_slice_buffer_destroy(&req->outgoing);
  GRPC_ERROR_UNREF(req->overall_error);
  grpc_resource_quota_internal_unref(exec_ctx, req->resource_quota);
  gpr_free(req);
 }
@ -126,7 +127,7 @@ static void append_error(internal_request *req, grpc_error *error) {
    req->overall_error = GRPC_ERROR_CREATE("Failed HTTP/1 client request");
  }
  grpc_resolved_address *addr = &req->addresses->addrs[req->next_address - 1];
-  char *addr_text = grpc_sockaddr_to_uri((struct sockaddr *)addr->addr);
+  char *addr_text = grpc_sockaddr_to_uri(addr);
  req->overall_error = grpc_error_add_child(
      req->overall_error,
      grpc_error_set_str(error, GRPC_ERROR_STR_TARGET_ADDRESS, addr_text));
@ -224,9 +225,15 @@ static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req,
  }
  addr = &req->addresses->addrs[req->next_address++];
  grpc_closure_init(&req->connected, on_connected, req);
-  grpc_tcp_client_connect(
+  grpc_arg arg;
-      exec_ctx, &req->connected, &req->ep, req->context->pollset_set,
+  arg.key = GRPC_ARG_RESOURCE_QUOTA;
-      (struct sockaddr *)&addr->addr, addr->len, req->deadline);
+  arg.type = GRPC_ARG_POINTER;
  arg.value.pointer.p = req->resource_quota;
  arg.value.pointer.vtable = grpc_resource_quota_arg_vtable();
  grpc_channel_args args = {1, &arg};
  grpc_tcp_client_connect(exec_ctx, &req->connected, &req->ep,
                          req->context->pollset_set, &args, addr,
                          req->deadline);
 }
 static void on_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
@ -242,6 +249,7 @@ static void on_resolved(grpc_exec_ctx *exec_ctx, void *arg, grpc_error *error) {
 static void internal_request_begin(grpc_exec_ctx *exec_ctx,
                                   grpc_httpcli_context *context,
                                   grpc_polling_entity *pollent,
                                   grpc_resource_quota *resource_quota,
                                   const grpc_httpcli_request *request,
                                   gpr_timespec deadline, grpc_closure *on_done,
                                   grpc_httpcli_response *response,
@ -257,6 +265,7 @@ static void internal_request_begin(grpc_exec_ctx *exec_ctx,
  req->context = context;
  req->pollent = pollent;
  req->overall_error = GRPC_ERROR_NONE;
  req->resource_quota = grpc_resource_quota_internal_ref(resource_quota);
  grpc_closure_init(&req->on_read, on_read, req);
  grpc_closure_init(&req->done_write, done_write, req);
  gpr_slice_buffer_init(&req->incoming);
@ -274,6 +283,7 @@ static void internal_request_begin(grpc_exec_ctx *exec_ctx,
 void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
                      grpc_polling_entity *pollent,
                      grpc_resource_quota *resource_quota,
                      const grpc_httpcli_request *request,
                      gpr_timespec deadline, grpc_closure *on_done,
                      grpc_httpcli_response *response) {
@ -283,14 +293,15 @@ void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
    return;
  }
  gpr_asprintf(&name, "HTTP:GET:%s:%s", request->host, request->http.path);
-  internal_request_begin(exec_ctx, context, pollent, request, deadline, on_done,
+  internal_request_begin(exec_ctx, context, pollent, resource_quota, request,
-                         response, name,
+                         deadline, on_done, response, name,
                         grpc_httpcli_format_get_request(request));
  gpr_free(name);
 }
 void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
                       grpc_polling_entity *pollent,
                       grpc_resource_quota *resource_quota,
                       const grpc_httpcli_request *request,
                       const char *body_bytes, size_t body_size,
                       gpr_timespec deadline, grpc_closure *on_done,
@ -303,7 +314,8 @@ void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
  }
  gpr_asprintf(&name, "HTTP:POST:%s:%s", request->host, request->http.path);
  internal_request_begin(
-      exec_ctx, context, pollent, request, deadline, on_done, response, name,
+      exec_ctx, context, pollent, resource_quota, request, deadline, on_done,
      response, name,
      grpc_httpcli_format_post_request(request, body_bytes, body_size));
  gpr_free(name);
 }
--- a/src/core/lib/http/httpcli.h
+++ b/src/core/lib/http/httpcli.h
@ -96,6 +96,7 @@ void grpc_httpcli_context_destroy(grpc_httpcli_context *context);
   'on_response' is a callback to report results to */
 void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
                      grpc_polling_entity *pollent,
                      grpc_resource_quota *resource_quota,
                      const grpc_httpcli_request *request,
                      gpr_timespec deadline, grpc_closure *on_complete,
                      grpc_httpcli_response *response);
@ -116,6 +117,7 @@ void grpc_httpcli_get(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
   Does not support ?var1=val1&var2=val2 in the path. */
 void grpc_httpcli_post(grpc_exec_ctx *exec_ctx, grpc_httpcli_context *context,
                       grpc_polling_entity *pollent,
                       grpc_resource_quota *resource_quota,
                       const grpc_httpcli_request *request,
                       const char *body_bytes, size_t body_size,
                       gpr_timespec deadline, grpc_closure *on_complete,
--- a/src/core/lib/iomgr/endpoint.c
+++ b/src/core/lib/iomgr/endpoint.c
@ -69,3 +69,7 @@ char* grpc_endpoint_get_peer(grpc_endpoint* ep) {
 grpc_workqueue* grpc_endpoint_get_workqueue(grpc_endpoint* ep) {
  return ep->vtable->get_workqueue(ep);
 }
 grpc_resource_user* grpc_endpoint_get_resource_user(grpc_endpoint* ep) {
  return ep->vtable->get_resource_user(ep);
 }
--- a/src/core/lib/iomgr/endpoint.h
+++ b/src/core/lib/iomgr/endpoint.h
@ -39,6 +39,7 @@
 #include <grpc/support/time.h>
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_set.h"
 #include "src/core/lib/iomgr/resource_quota.h"
 /* An endpoint caps a streaming channel between two communicating processes.
   Examples may be: a tcp socket, <stdin+stdout>, or some shared memory. */
@ -58,6 +59,7 @@ struct grpc_endpoint_vtable {
                             grpc_pollset_set *pollset);
  void (*shutdown)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep);
  void (*destroy)(grpc_exec_ctx *exec_ctx, grpc_endpoint *ep);
  grpc_resource_user *(*get_resource_user)(grpc_endpoint *ep);
  char *(*get_peer)(grpc_endpoint *ep);
 };
@ -100,6 +102,8 @@ void grpc_endpoint_add_to_pollset_set(grpc_exec_ctx *exec_ctx,
                                      grpc_endpoint *ep,
                                      grpc_pollset_set *pollset_set);
 grpc_resource_user *grpc_endpoint_get_resource_user(grpc_endpoint *endpoint);
 struct grpc_endpoint {
  const grpc_endpoint_vtable *vtable;
 };
--- a/src/core/lib/iomgr/endpoint_pair.h
+++ b/src/core/lib/iomgr/endpoint_pair.h
@ -41,7 +41,8 @@ typedef struct {
  grpc_endpoint *server;
 } grpc_endpoint_pair;
-grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name,
+grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(
-                                                   size_t read_slice_size);
+    const char *name, grpc_resource_quota *resource_quota,
    size_t read_slice_size);
 #endif /* GRPC_CORE_LIB_IOMGR_ENDPOINT_PAIR_H */
--- a/src/core/lib/iomgr/endpoint_pair_posix.c
+++ b/src/core/lib/iomgr/endpoint_pair_posix.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/socket_utils_posix.h"
@ -62,20 +62,21 @@ static void create_sockets(int sv[2]) {
  GPR_ASSERT(grpc_set_socket_no_sigpipe_if_possible(sv[1]) == GRPC_ERROR_NONE);
 }
-grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name,
+grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(
-                                                   size_t read_slice_size) {
+    const char *name, grpc_resource_quota *resource_quota,
    size_t read_slice_size) {
  int sv[2];
  grpc_endpoint_pair p;
  char *final_name;
  create_sockets(sv);
  gpr_asprintf(&final_name, "%s:client", name);
-  p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), read_slice_size,
+  p.client = grpc_tcp_create(grpc_fd_create(sv[1], final_name), resource_quota,
-                             "socketpair-server");
+                             read_slice_size, "socketpair-server");
  gpr_free(final_name);
  gpr_asprintf(&final_name, "%s:server", name);
-  p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), read_slice_size,
+  p.server = grpc_tcp_create(grpc_fd_create(sv[0], final_name), resource_quota,
-                             "socketpair-client");
+                             read_slice_size, "socketpair-client");
  gpr_free(final_name);
  return p;
 }
--- a/src/core/lib/security/credentials/google_default/credentials_windows.c
+++ b/src/core/lib/security/credentials/google_default/credentials_windows.c
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015, Google Inc.
+ * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@ -31,31 +31,24 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINDOWS
+#ifdef GRPC_UV
-#include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
+#include <stdlib.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
-#include "src/core/lib/support/env.h"
+#include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/support/string.h"
-char *grpc_get_well_known_google_credentials_file_path_impl(void) {
+grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(
-  char *result = NULL;
+    const char *name, grpc_resource_quota *resource_quota,
-  char *appdata_path = gpr_getenv("APPDATA");
+    size_t read_slice_size) {
-  if (appdata_path == NULL) {
+  grpc_endpoint_pair endpoint_pair;
-    gpr_log(GPR_ERROR, "Could not get APPDATA environment variable.");
+  // TODO(mlumish): implement this properly under libuv
-    return NULL;
+  GPR_ASSERT(false &&
-  }
+             "grpc_iomgr_create_endpoint_pair is not suppoted with libuv");
-  gpr_asprintf(&result, "%s/%s/%s", appdata_path,
+  return endpoint_pair;
               GRPC_GOOGLE_CLOUD_SDK_CONFIG_DIRECTORY,
               GRPC_GOOGLE_WELL_KNOWN_CREDENTIALS_FILE);
  gpr_free(appdata_path);
  return result;
 }
-#endif /* GPR_WINDOWS */
+#endif /* GRPC_UV */
--- a/src/core/lib/iomgr/endpoint_pair_windows.c
+++ b/src/core/lib/iomgr/endpoint_pair_windows.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINSOCK_SOCKET
+#ifdef GRPC_WINSOCK_SOCKET
 #include "src/core/lib/iomgr/endpoint_pair.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
@ -82,15 +82,16 @@ static void create_sockets(SOCKET sv[2]) {
  sv[0] = svr_sock;
 }
-grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(const char *name,
+grpc_endpoint_pair grpc_iomgr_create_endpoint_pair(
-                                                   size_t read_slice_size) {
+    const char *name, grpc_resource_quota *resource_quota,
    size_t read_slice_size) {
  SOCKET sv[2];
  grpc_endpoint_pair p;
  create_sockets(sv);
  p.client = grpc_tcp_create(grpc_winsocket_create(sv[1], "endpoint:client"),
-                             "endpoint:server");
+                             resource_quota, "endpoint:server");
  p.server = grpc_tcp_create(grpc_winsocket_create(sv[0], "endpoint:server"),
-                             "endpoint:client");
+                             resource_quota, "endpoint:client");
  return p;
 }
--- a/src/core/lib/iomgr/ev_epoll_linux.c
+++ b/src/core/lib/iomgr/ev_epoll_linux.c
@ -32,10 +32,10 @@
 */
 #include <grpc/grpc_posix.h>
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
 /* This polling engine is only relevant on linux kernels supporting epoll() */
-#ifdef GPR_LINUX_EPOLL
+#ifdef GRPC_LINUX_EPOLL
 #include "src/core/lib/iomgr/ev_epoll_linux.h"
@ -1711,6 +1711,12 @@ retry:
            "pollset_add_fd: Raced creating new polling island. pi_new: %p "
            "(fd: %d, pollset: %p)",
            (void *)pi_new, fd->fd, (void *)pollset);
        /* No need to lock 'pi_new' here since this is a new polling island and
         * no one has a reference to it yet */
        polling_island_remove_all_fds_locked(pi_new, true, &error);
        /* Ref and unref so that the polling island gets deleted during unref */
        PI_ADD_REF(pi_new, "dance_of_destruction");
        PI_UNREF(exec_ctx, pi_new, "dance_of_destruction");
        goto retry;
@ -2049,13 +2055,13 @@ const grpc_event_engine_vtable *grpc_init_epoll_linux(void) {
  return &vtable;
 }
-#else /* defined(GPR_LINUX_EPOLL) */
+#else /* defined(GRPC_LINUX_EPOLL) */
-#if defined(GPR_POSIX_SOCKET)
+#if defined(GRPC_POSIX_SOCKET)
 #include "src/core/lib/iomgr/ev_posix.h"
-/* If GPR_LINUX_EPOLL is not defined, it means epoll is not available. Return
+/* If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return
 * NULL */
 const grpc_event_engine_vtable *grpc_init_epoll_linux(void) { return NULL; }
-#endif /* defined(GPR_POSIX_SOCKET) */
+#endif /* defined(GRPC_POSIX_SOCKET) */
 void grpc_use_signal(int signum) {}
-#endif /* !defined(GPR_LINUX_EPOLL) */
+#endif /* !defined(GRPC_LINUX_EPOLL) */
--- a/src/core/lib/iomgr/ev_epoll_linux.h
+++ b/src/core/lib/iomgr/ev_epoll_linux.h
@ -35,13 +35,14 @@
 #define GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H
 #include "src/core/lib/iomgr/ev_posix.h"
 #include "src/core/lib/iomgr/port.h"
 const grpc_event_engine_vtable *grpc_init_epoll_linux(void);
-#ifdef GPR_LINUX_EPOLL
+#ifdef GRPC_LINUX_EPOLL
 void *grpc_fd_get_polling_island(grpc_fd *fd);
 void *grpc_pollset_get_polling_island(grpc_pollset *ps);
 bool grpc_are_polling_islands_equal(void *p, void *q);
-#endif /* defined(GPR_LINUX_EPOLL) */
+#endif /* defined(GRPC_LINUX_EPOLL) */
 #endif /* GRPC_CORE_LIB_IOMGR_EV_EPOLL_LINUX_H */
--- a/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
+++ b/src/core/lib/iomgr/ev_poll_and_epoll_posix.c
@ -42,9 +42,9 @@
 *  - ev_epoll_posix.{h,c}
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/iomgr/ev_poll_and_epoll_posix.h"
@ -1338,7 +1338,7 @@ static void become_basic_pollset(grpc_pollset *pollset, grpc_fd *fd_or_null) {
 * pollset_multipoller_with_poll_posix.c
 */
-#ifndef GPR_LINUX_MULTIPOLL_WITH_EPOLL
+#ifndef GRPC_LINUX_MULTIPOLL_WITH_EPOLL
 typedef struct {
  /* all polled fds */
@ -1520,13 +1520,13 @@ static void poll_become_multipoller(grpc_exec_ctx *exec_ctx,
  }
 }
-#endif /* !GPR_LINUX_MULTIPOLL_WITH_EPOLL */
+#endif /* !GRPC_LINUX_MULTIPOLL_WITH_EPOLL */
 /*******************************************************************************
 * pollset_multipoller_with_epoll_posix.c
 */
-#ifdef GPR_LINUX_MULTIPOLL_WITH_EPOLL
+#ifdef GRPC_LINUX_MULTIPOLL_WITH_EPOLL
 #include <errno.h>
 #include <poll.h>
@ -1839,11 +1839,11 @@ static void epoll_become_multipoller(grpc_exec_ctx *exec_ctx,
  }
 }
-#else /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */
+#else /* GRPC_LINUX_MULTIPOLL_WITH_EPOLL */
 static void remove_fd_from_all_epoll_sets(int fd) {}
-#endif /* GPR_LINUX_MULTIPOLL_WITH_EPOLL */
+#endif /* GRPC_LINUX_MULTIPOLL_WITH_EPOLL */
 /*******************************************************************************
 * pollset_set_posix.c
@ -2063,7 +2063,7 @@ static const grpc_event_engine_vtable vtable = {
 };
 const grpc_event_engine_vtable *grpc_init_poll_and_epoll_posix(void) {
-#ifdef GPR_LINUX_MULTIPOLL_WITH_EPOLL
+#ifdef GRPC_LINUX_MULTIPOLL_WITH_EPOLL
  platform_become_multipoller = epoll_become_multipoller;
 #else
  platform_become_multipoller = poll_become_multipoller;
--- a/src/core/lib/iomgr/ev_poll_posix.c
+++ b/src/core/lib/iomgr/ev_poll_posix.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/iomgr/ev_poll_posix.h"
--- a/src/core/lib/iomgr/ev_posix.c
+++ b/src/core/lib/iomgr/ev_posix.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/iomgr/ev_posix.h"
@ -282,4 +282,4 @@ void grpc_workqueue_enqueue(grpc_exec_ctx *exec_ctx, grpc_workqueue *workqueue,
  g_event_engine->workqueue_enqueue(exec_ctx, workqueue, closure, error);
 }
-#endif  // GPR_POSIX_SOCKET
+#endif  // GRPC_POSIX_SOCKET
--- a/src/core/lib/iomgr/iocp_windows.c
+++ b/src/core/lib/iomgr/iocp_windows.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINSOCK_SOCKET
+#ifdef GRPC_WINSOCK_SOCKET
 #include <winsock2.h>
@ -166,4 +166,4 @@ void grpc_iocp_add_socket(grpc_winsocket *socket) {
  GPR_ASSERT(ret == g_iocp);
 }
-#endif /* GPR_WINSOCK_SOCKET */
+#endif /* GRPC_WINSOCK_SOCKET */
--- a/src/core/lib/iomgr/iomgr.h
+++ b/src/core/lib/iomgr/iomgr.h
@ -34,6 +34,8 @@
 #ifndef GRPC_CORE_LIB_IOMGR_IOMGR_H
 #define GRPC_CORE_LIB_IOMGR_IOMGR_H
 #include "src/core/lib/iomgr/port.h"
 /** Initializes the iomgr. */
 void grpc_iomgr_init(void);
--- a/src/core/lib/iomgr/iomgr_posix.c
+++ b/src/core/lib/iomgr/iomgr_posix.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/ev_posix.h"
--- a/src/core/lib/iomgr/iomgr_uv.c
+++ b/src/core/lib/iomgr/iomgr_uv.c
@ -0,0 +1,49 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_UV
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/pollset_uv.h"
 #include "src/core/lib/iomgr/tcp_uv.h"
 void grpc_iomgr_platform_init(void) {
  grpc_pollset_global_init();
  grpc_register_tracer("tcp", &grpc_tcp_trace);
 }
 void grpc_iomgr_platform_flush(void) {}
 void grpc_iomgr_platform_shutdown(void) { grpc_pollset_global_shutdown(); }
 #endif /* GRPC_UV */
--- a/src/core/lib/iomgr/iomgr_windows.c
+++ b/src/core/lib/iomgr/iomgr_windows.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINSOCK_SOCKET
+#ifdef GRPC_WINSOCK_SOCKET
 #include "src/core/lib/iomgr/sockaddr_windows.h"
--- a/src/core/lib/iomgr/pollset_set_uv.c
+++ b/src/core/lib/iomgr/pollset_set_uv.c
@ -0,0 +1,62 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_UV
 #include "src/core/lib/iomgr/pollset_set.h"
 grpc_pollset_set* grpc_pollset_set_create(void) {
  return (grpc_pollset_set*)((intptr_t)0xdeafbeef);
 }
 void grpc_pollset_set_destroy(grpc_pollset_set* pollset_set) {}
 void grpc_pollset_set_add_pollset(grpc_exec_ctx* exec_ctx,
                                  grpc_pollset_set* pollset_set,
                                  grpc_pollset* pollset) {}
 void grpc_pollset_set_del_pollset(grpc_exec_ctx* exec_ctx,
                                  grpc_pollset_set* pollset_set,
                                  grpc_pollset* pollset) {}
 void grpc_pollset_set_add_pollset_set(grpc_exec_ctx* exec_ctx,
                                      grpc_pollset_set* bag,
                                      grpc_pollset_set* item) {}
 void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx,
                                      grpc_pollset_set* bag,
                                      grpc_pollset_set* item) {}
 #endif /* GRPC_UV */
--- a/src/core/lib/iomgr/pollset_set_windows.c
+++ b/src/core/lib/iomgr/pollset_set_windows.c
@ -31,10 +31,10 @@
 *
 */
 #include <grpc/support/port_platform.h>
 #include <stdint.h>
 #include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINSOCK_SOCKET
+#ifdef GRPC_WINSOCK_SOCKET
 #include "src/core/lib/iomgr/pollset_set_windows.h"
@ -60,4 +60,4 @@ void grpc_pollset_set_del_pollset_set(grpc_exec_ctx* exec_ctx,
                                      grpc_pollset_set* bag,
                                      grpc_pollset_set* item) {}
-#endif /* GPR_WINSOCK_SOCKET */
+#endif /* GRPC_WINSOCK_SOCKET */
--- a/src/core/lib/iomgr/pollset_uv.c
+++ b/src/core/lib/iomgr/pollset_uv.c
@ -0,0 +1,142 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_UV
 #include <uv.h>
 #include <string.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include "src/core/lib/iomgr/pollset.h"
 #include "src/core/lib/iomgr/pollset_uv.h"
 struct grpc_pollset {
  uv_timer_t timer;
  int shutting_down;
 };
 /* Indicates that grpc_pollset_work should run an iteration of the UV loop
   before running callbacks. This defaults to 1, and should be disabled if
   grpc_pollset_work will be called within the callstack of uv_run */
 int grpc_pollset_work_run_loop;
 gpr_mu grpc_polling_mu;
 size_t grpc_pollset_size() { return sizeof(grpc_pollset); }
 void grpc_pollset_global_init(void) {
  gpr_mu_init(&grpc_polling_mu);
  grpc_pollset_work_run_loop = 1;
 }
 void grpc_pollset_global_shutdown(void) { gpr_mu_destroy(&grpc_polling_mu); }
 void grpc_pollset_init(grpc_pollset *pollset, gpr_mu **mu) {
  *mu = &grpc_polling_mu;
  memset(pollset, 0, sizeof(grpc_pollset));
  uv_timer_init(uv_default_loop(), &pollset->timer);
  pollset->shutting_down = 0;
 }
 static void timer_close_cb(uv_handle_t *handle) { handle->data = (void *)1; }
 void grpc_pollset_shutdown(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
                           grpc_closure *closure) {
  GPR_ASSERT(!pollset->shutting_down);
  pollset->shutting_down = 1;
  if (grpc_pollset_work_run_loop) {
    // Drain any pending UV callbacks without blocking
    uv_run(uv_default_loop(), UV_RUN_NOWAIT);
  }
  grpc_exec_ctx_sched(exec_ctx, closure, GRPC_ERROR_NONE, NULL);
 }
 void grpc_pollset_destroy(grpc_pollset *pollset) {
  uv_close((uv_handle_t *)&pollset->timer, timer_close_cb);
  // timer.data is a boolean indicating that the timer has finished closing
  pollset->timer.data = (void *)0;
  if (grpc_pollset_work_run_loop) {
    while (!pollset->timer.data) {
      uv_run(uv_default_loop(), UV_RUN_NOWAIT);
    }
  }
 }
 void grpc_pollset_reset(grpc_pollset *pollset) {
  GPR_ASSERT(pollset->shutting_down);
  pollset->shutting_down = 0;
 }
 static void timer_run_cb(uv_timer_t *timer) {}
 grpc_error *grpc_pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
                              grpc_pollset_worker **worker_hdl,
                              gpr_timespec now, gpr_timespec deadline) {
  uint64_t timeout;
  gpr_mu_unlock(&grpc_polling_mu);
  if (grpc_pollset_work_run_loop) {
    if (gpr_time_cmp(deadline, now) >= 0) {
      timeout = (uint64_t)gpr_time_to_millis(gpr_time_sub(deadline, now));
    } else {
      timeout = 0;
    }
    /* We special-case timeout=0 so that we don't bother with the timer when
       the loop won't block anyway */
    if (timeout > 0) {
      uv_timer_start(&pollset->timer, timer_run_cb, timeout, 0);
      /* Run until there is some I/O activity or the timer triggers. It doesn't
         matter which happens */
      uv_run(uv_default_loop(), UV_RUN_ONCE);
      uv_timer_stop(&pollset->timer);
    } else {
      uv_run(uv_default_loop(), UV_RUN_NOWAIT);
    }
  }
  if (!grpc_closure_list_empty(exec_ctx->closure_list)) {
    grpc_exec_ctx_flush(exec_ctx);
  }
  gpr_mu_lock(&grpc_polling_mu);
  return GRPC_ERROR_NONE;
 }
 grpc_error *grpc_pollset_kick(grpc_pollset *pollset,
                              grpc_pollset_worker *specific_worker) {
  return GRPC_ERROR_NONE;
 }
 #endif /* GRPC_UV */
--- a/src/core/lib/iomgr/pollset_uv.h
+++ b/src/core/lib/iomgr/pollset_uv.h
@ -0,0 +1,42 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #ifndef GRPC_CORE_LIB_IOMGR_POLLSET_UV_H
 #define GRPC_CORE_LIB_IOMGR_POLLSET_UV_H
 extern int grpc_pollset_work_run_loop;
 void grpc_pollset_global_init(void);
 void grpc_pollset_global_shutdown(void);
 #endif /* GRPC_CORE_LIB_IOMGR_POLLSET_UV_H */
--- a/src/core/lib/iomgr/pollset_windows.c
+++ b/src/core/lib/iomgr/pollset_windows.c
@ -31,9 +31,9 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_WINSOCK_SOCKET
+#ifdef GRPC_WINSOCK_SOCKET
 #include <grpc/support/log.h>
 #include <grpc/support/thd.h>
@ -241,4 +241,4 @@ grpc_error *grpc_pollset_kick(grpc_pollset *p,
 void grpc_kick_poller(void) { grpc_iocp_kick(); }
-#endif /* GPR_WINSOCK_SOCKET */
+#endif /* GRPC_WINSOCK_SOCKET */
--- a/src/core/lib/iomgr/port.h
+++ b/src/core/lib/iomgr/port.h
@ -0,0 +1,129 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #include <grpc/support/port_platform.h>
 #ifndef GRPC_CORE_LIB_IOMGR_PORT_H
 #define GRPC_CORE_LIB_IOMGR_PORT_H
 #if defined(GRPC_UV)
 // Do nothing
 #elif defined(GPR_MANYLINUX1)
 #define GRPC_HAVE_IPV6_RECVPKTINFO 1
 #define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_MSG_NOSIGNAL 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_SOCKETUTILS 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #elif defined(GPR_WINDOWS)
 #define GRPC_TIMER_USE_GENERIC 1
 #define GRPC_WINSOCK_SOCKET 1
 #define GRPC_WINDOWS_SOCKETUTILS 1
 #elif defined(GPR_ANDROID)
 #define GRPC_HAVE_IPV6_RECVPKTINFO 1
 #define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_MSG_NOSIGNAL 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_LINUX_EVENTFD 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_SOCKETUTILS 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #elif defined(GPR_LINUX)
 #define GRPC_HAVE_IPV6_RECVPKTINFO 1
 #define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_MSG_NOSIGNAL 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_LINUX_MULTIPOLL_WITH_EPOLL 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #ifdef __GLIBC_PREREQ
 #if __GLIBC_PREREQ(2, 9)
 #define GRPC_LINUX_EPOLL 1
 #define GRPC_LINUX_EVENTFD 1
 #endif
 #if __GLIBC_PREREQ(2, 10)
 #define GRPC_LINUX_SOCKETUTILS 1
 #endif
 #endif
 #ifndef GRPC_LINUX_EVENTFD
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #endif
 #ifndef GRPC_LINUX_SOCKETUTILS
 #define GRPC_POSIX_SOCKETUTILS
 #endif
 #elif defined(GPR_APPLE)
 #define GRPC_HAVE_SO_NOSIGPIPE 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_MSG_IOVLEN_TYPE int
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_SOCKETUTILS 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #elif defined(GPR_FREEBSD)
 #define GRPC_HAVE_IPV6_RECVPKTINFO 1
 #define GRPC_HAVE_SO_NOSIGPIPE 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_SOCKETUTILS 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #elif defined(GPR_NACL)
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1
 #define GRPC_POSIX_SOCKET 1
 #define GRPC_POSIX_SOCKETADDR 1
 #define GRPC_POSIX_SOCKETUTILS 1
 #define GRPC_POSIX_WAKEUP_FD 1
 #define GRPC_TIMER_USE_GENERIC 1
 #elif !defined(GPR_NO_AUTODETECT_PLATFORM)
 #error "Platform not recognized"
 #endif
 #if defined(GRPC_POSIX_SOCKET) + defined(GRPC_WINSOCK_SOCKET) + \
        defined(GRPC_CUSTOM_SOCKET) + defined(GRPC_UV) !=       \
    1
 #error Must define exactly one of GRPC_POSIX_SOCKET, GRPC_WINSOCK_SOCKET, GPR_CUSTOM_SOCKET
 #endif
 #endif /* GRPC_CORE_LIB_IOMGR_PORT_H */
--- a/src/core/lib/iomgr/resolve_address.h
+++ b/src/core/lib/iomgr/resolve_address.h
@ -36,7 +36,6 @@
 #include <stddef.h>
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr.h"
 #define GRPC_MAX_SOCKADDR_SIZE 128
--- a/src/core/lib/iomgr/resolve_address_posix.c
+++ b/src/core/lib/iomgr/resolve_address_posix.c
@ -31,12 +31,13 @@
 *
 */
-#include <grpc/support/port_platform.h>
+#include "src/core/lib/iomgr/port.h"
-#ifdef GPR_POSIX_SOCKET
+#ifdef GRPC_POSIX_SOCKET
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include <string.h>
 #include <sys/types.h>
@ -49,7 +50,6 @@
 #include <grpc/support/useful.h>
 #include "src/core/lib/iomgr/executor.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
 #include "src/core/lib/iomgr/unix_sockets_posix.h"
 #include "src/core/lib/support/block_annotate.h"
 #include "src/core/lib/support/string.h"
--- a/src/core/lib/iomgr/resolve_address_uv.c
+++ b/src/core/lib/iomgr/resolve_address_uv.c
@ -0,0 +1,231 @@
 /*
 *
 * Copyright 2016, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *
 */
 #include "src/core/lib/iomgr/port.h"
 #ifdef GRPC_UV
 #include <uv.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/host_port.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
 #include <string.h>
 typedef struct request {
  grpc_closure *on_done;
  grpc_resolved_addresses **addresses;
  struct addrinfo *hints;
 } request;
 static grpc_error *handle_addrinfo_result(int status, struct addrinfo *result,
                                          grpc_resolved_addresses **addresses) {
  struct addrinfo *resp;
  size_t i;
  if (status != 0) {
    grpc_error *error;
    *addresses = NULL;
    error = GRPC_ERROR_CREATE("getaddrinfo failed");
    error =
        grpc_error_set_str(error, GRPC_ERROR_STR_OS_ERROR, uv_strerror(status));
    return error;
  }
  (*addresses) = gpr_malloc(sizeof(grpc_resolved_addresses));
  (*addresses)->naddrs = 0;
  for (resp = result; resp != NULL; resp = resp->ai_next) {
    (*addresses)->naddrs++;
  }
  (*addresses)->addrs =
      gpr_malloc(sizeof(grpc_resolved_address) * (*addresses)->naddrs);
  i = 0;
  for (resp = result; resp != NULL; resp = resp->ai_next) {
    memcpy(&(*addresses)->addrs[i].addr, resp->ai_addr, resp->ai_addrlen);
    (*addresses)->addrs[i].len = resp->ai_addrlen;
    i++;
  }
  {
    for (i = 0; i < (*addresses)->naddrs; i++) {
      char *buf;
      grpc_sockaddr_to_string(&buf, &(*addresses)->addrs[i], 0);
      gpr_free(buf);
    }
  }
  return GRPC_ERROR_NONE;
 }
 static void getaddrinfo_callback(uv_getaddrinfo_t *req, int status,
                                 struct addrinfo *res) {
  request *r = (request *)req->data;
  grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
  grpc_error *error;
  error = handle_addrinfo_result(status, res, r->addresses);
  grpc_exec_ctx_sched(&exec_ctx, r->on_done, error, NULL);
  grpc_exec_ctx_finish(&exec_ctx);
  gpr_free(r->hints);
  gpr_free(r);
  gpr_free(req);
  uv_freeaddrinfo(res);
 }
 static grpc_error *try_split_host_port(const char *name,
                                       const char *default_port, char **host,
                                       char **port) {
  /* parse name, splitting it into host and port parts */
  grpc_error *error;
  gpr_split_host_port(name, host, port);
  if (host == NULL) {
    char *msg;
    gpr_asprintf(&msg, "unparseable host:port: '%s'", name);
    error = GRPC_ERROR_CREATE(msg);
    gpr_free(msg);
    return error;
  }
  if (port == NULL) {
    if (default_port == NULL) {
      char *msg;
      gpr_asprintf(&msg, "no port in name '%s'", name);
      error = GRPC_ERROR_CREATE(msg);
      gpr_free(msg);
      return error;
    }
    *port = gpr_strdup(default_port);
  }
  return GRPC_ERROR_NONE;
 }
 static grpc_error *blocking_resolve_address_impl(
    const char *name, const char *default_port,
    grpc_resolved_addresses **addresses) {
  char *host;
  char *port;
  struct addrinfo hints;
  uv_getaddrinfo_t req;
  int s;
  grpc_error *err;
  req.addrinfo = NULL;
  err = try_split_host_port(name, default_port, &host, &port);
  if (err != GRPC_ERROR_NONE) {
    goto done;
  }
  /* Call getaddrinfo */
  memset(&hints, 0, sizeof(hints));
  hints.ai_family = AF_UNSPEC;     /* ipv4 or ipv6 */
  hints.ai_socktype = SOCK_STREAM; /* stream socket */
  hints.ai_flags = AI_PASSIVE;     /* for wildcard IP address */
  s = uv_getaddrinfo(uv_default_loop(), &req, NULL, host, port, &hints);
  err = handle_addrinfo_result(s, req.addrinfo, addresses);
 done:
  gpr_free(host);
  gpr_free(port);
  if (req.addrinfo) {
    uv_freeaddrinfo(req.addrinfo);
  }
  return err;
 }
 grpc_error *(*grpc_blocking_resolve_address)(
    const char *name, const char *default_port,
    grpc_resolved_addresses **addresses) = blocking_resolve_address_impl;
 void grpc_resolved_addresses_destroy(grpc_resolved_addresses *addrs) {
  if (addrs != NULL) {
    gpr_free(addrs->addrs);
  }
  gpr_free(addrs);
 }
 static void resolve_address_impl(grpc_exec_ctx *exec_ctx, const char *name,
                                 const char *default_port,
                                 grpc_closure *on_done,
                                 grpc_resolved_addresses **addrs) {
  uv_getaddrinfo_t *req;
  request *r;
  struct addrinfo *hints;
  char *host;
  char *port;
  grpc_error *err;
  int s;
  err = try_split_host_port(name, default_port, &host, &port);
  if (err != GRPC_ERROR_NONE) {
    grpc_exec_ctx_sched(exec_ctx, on_done, err, NULL);
    return;
  }
  r = gpr_malloc(sizeof(request));
  r->on_done = on_done;
  r->addresses = addrs;
  req = gpr_malloc(sizeof(uv_getaddrinfo_t));
  req->data = r;
  /* Call getaddrinfo */
  hints = gpr_malloc(sizeof(struct addrinfo));
  memset(hints, 0, sizeof(struct addrinfo));
  hints->ai_family = AF_UNSPEC;     /* ipv4 or ipv6 */
  hints->ai_socktype = SOCK_STREAM; /* stream socket */
  hints->ai_flags = AI_PASSIVE;     /* for wildcard IP address */
  r->hints = hints;
  s = uv_getaddrinfo(uv_default_loop(), req, getaddrinfo_callback, host, port,
                     hints);
  if (s != 0) {
    *addrs = NULL;
    err = GRPC_ERROR_CREATE("getaddrinfo failed");
    err = grpc_error_set_str(err, GRPC_ERROR_STR_OS_ERROR, uv_strerror(s));
    grpc_exec_ctx_sched(exec_ctx, on_done, err, NULL);
    gpr_free(r);
    gpr_free(req);
    gpr_free(hints);
  }
 }
 void (*grpc_resolve_address)(grpc_exec_ctx *exec_ctx, const char *name,
                             const char *default_port, grpc_closure *on_done,
                             grpc_resolved_addresses **addrs) =
    resolve_address_impl;
 #endif /* GRPC_UV */
--- a/Show More
+++ b/Show More