grpc 1.49.1-x86_64-linux → 1.50.0.pre1-x86_64-linux

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of grpc might be problematic. Click here for more details.

Files changed (275) hide show
  1. checksums.yaml +4 -4
  2. data/Makefile +54 -153
  3. data/include/grpc/event_engine/endpoint_config.h +11 -5
  4. data/include/grpc/event_engine/event_engine.h +1 -1
  5. data/include/grpc/impl/codegen/atm_gcc_atomic.h +19 -28
  6. data/include/grpc/impl/codegen/atm_gcc_sync.h +0 -2
  7. data/include/grpc/impl/codegen/atm_windows.h +0 -2
  8. data/include/grpc/impl/codegen/grpc_types.h +6 -0
  9. data/src/core/ext/filters/channel_idle/channel_idle_filter.cc +3 -3
  10. data/src/core/ext/filters/client_channel/backup_poller.cc +4 -6
  11. data/src/core/ext/filters/client_channel/client_channel.cc +33 -22
  12. data/src/core/ext/filters/client_channel/client_channel.h +1 -1
  13. data/src/core/ext/filters/client_channel/client_channel_plugin.cc +0 -16
  14. data/src/core/ext/filters/client_channel/http_proxy.cc +12 -19
  15. data/src/core/ext/filters/client_channel/http_proxy.h +3 -2
  16. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.cc +6 -4
  17. data/src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h +5 -4
  18. data/src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.cc +0 -2
  19. data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +112 -96
  20. data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc +20 -11
  21. data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.cc +106 -108
  22. data/src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h +16 -0
  23. data/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc +20 -13
  24. data/src/core/ext/filters/client_channel/lb_policy/priority/priority.cc +165 -257
  25. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.cc +218 -231
  26. data/src/core/ext/filters/client_channel/lb_policy/ring_hash/ring_hash.h +10 -6
  27. data/src/core/ext/filters/client_channel/lb_policy/rls/rls.cc +389 -444
  28. data/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +16 -16
  29. data/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +8 -13
  30. data/src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc +84 -96
  31. data/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc +38 -37
  32. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_impl.cc +106 -186
  33. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc +106 -93
  34. data/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc +170 -218
  35. data/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.cc +2 -2
  36. data/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +1 -1
  37. data/src/core/ext/filters/client_channel/resolver/google_c2p/google_c2p_resolver.cc +13 -15
  38. data/src/core/ext/filters/client_channel/resolver/polling_resolver.cc +84 -37
  39. data/src/core/ext/filters/client_channel/resolver/polling_resolver.h +11 -0
  40. data/src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc +1 -0
  41. data/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc +5 -3
  42. data/src/core/ext/filters/client_channel/resolver_result_parsing.cc +5 -4
  43. data/src/core/ext/filters/client_channel/retry_filter.cc +25 -29
  44. data/src/core/ext/filters/client_channel/subchannel.cc +38 -33
  45. data/src/core/ext/filters/client_channel/subchannel.h +12 -3
  46. data/src/core/ext/filters/client_channel/subchannel_stream_client.cc +1 -2
  47. data/src/core/ext/filters/fault_injection/fault_injection_filter.cc +23 -16
  48. data/src/core/ext/filters/fault_injection/fault_injection_filter.h +8 -0
  49. data/src/core/ext/filters/http/client/http_client_filter.cc +1 -2
  50. data/src/core/ext/filters/http/message_compress/message_compress_filter.cc +2 -4
  51. data/src/core/ext/filters/http/message_compress/message_decompress_filter.cc +0 -2
  52. data/src/core/ext/filters/http/server/http_server_filter.cc +1 -2
  53. data/src/core/ext/transport/chttp2/client/chttp2_connector.cc +12 -8
  54. data/src/core/ext/transport/chttp2/server/chttp2_server.cc +32 -26
  55. data/src/core/ext/transport/chttp2/transport/bin_encoder.cc +1 -1
  56. data/src/core/ext/transport/chttp2/transport/chttp2_transport.cc +25 -130
  57. data/src/core/ext/transport/chttp2/transport/decode_huff.cc +287 -0
  58. data/src/core/ext/transport/chttp2/transport/decode_huff.h +1018 -0
  59. data/src/core/ext/transport/chttp2/transport/flow_control.cc +83 -51
  60. data/src/core/ext/transport/chttp2/transport/flow_control.h +11 -6
  61. data/src/core/ext/transport/chttp2/transport/frame_ping.cc +1 -2
  62. data/src/core/ext/transport/chttp2/transport/hpack_encoder.cc +2 -20
  63. data/src/core/ext/transport/chttp2/transport/hpack_parser.cc +28 -28
  64. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.cc +1 -10
  65. data/src/core/ext/transport/chttp2/transport/hpack_parser_table.h +11 -6
  66. data/src/core/ext/transport/chttp2/transport/internal.h +2 -0
  67. data/src/core/ext/transport/chttp2/transport/parsing.cc +44 -0
  68. data/src/core/ext/transport/chttp2/transport/writing.cc +3 -14
  69. data/src/core/ext/transport/inproc/inproc_transport.cc +1 -3
  70. data/src/core/ext/xds/certificate_provider_store.cc +63 -3
  71. data/src/core/ext/xds/certificate_provider_store.h +9 -1
  72. data/src/core/ext/xds/file_watcher_certificate_provider_factory.cc +5 -5
  73. data/src/core/ext/xds/file_watcher_certificate_provider_factory.h +1 -1
  74. data/src/core/ext/xds/xds_api.cc +21 -17
  75. data/src/core/ext/xds/xds_api.h +7 -0
  76. data/src/core/ext/xds/xds_bootstrap.cc +5 -537
  77. data/src/core/ext/xds/xds_bootstrap.h +39 -111
  78. data/src/core/ext/xds/xds_bootstrap_grpc.cc +370 -0
  79. data/src/core/ext/xds/xds_bootstrap_grpc.h +169 -0
  80. data/src/core/ext/xds/xds_client.cc +219 -145
  81. data/src/core/ext/xds/xds_client.h +19 -17
  82. data/src/core/ext/xds/xds_client_grpc.cc +18 -80
  83. data/src/core/ext/xds/xds_client_grpc.h +2 -25
  84. data/src/core/ext/xds/xds_client_stats.cc +4 -4
  85. data/src/core/ext/xds/xds_cluster.cc +87 -79
  86. data/src/core/ext/xds/xds_cluster.h +5 -5
  87. data/src/core/ext/xds/xds_cluster_specifier_plugin.cc +3 -1
  88. data/src/core/ext/xds/xds_common_types.cc +13 -5
  89. data/src/core/ext/xds/xds_endpoint.cc +8 -6
  90. data/src/core/ext/xds/xds_endpoint.h +3 -4
  91. data/src/core/ext/xds/xds_lb_policy_registry.cc +4 -2
  92. data/src/core/ext/xds/xds_listener.cc +25 -20
  93. data/src/core/ext/xds/xds_listener.h +3 -4
  94. data/src/core/ext/xds/xds_resource_type.h +11 -8
  95. data/src/core/ext/xds/xds_route_config.cc +15 -16
  96. data/src/core/ext/xds/xds_route_config.h +3 -3
  97. data/src/core/ext/xds/xds_server_config_fetcher.cc +7 -5
  98. data/src/core/ext/xds/xds_transport_grpc.cc +15 -7
  99. data/src/core/lib/backoff/backoff.cc +2 -4
  100. data/src/core/lib/channel/call_finalization.h +1 -3
  101. data/src/core/lib/channel/channel_args.h +114 -14
  102. data/src/core/lib/channel/channel_trace.cc +3 -4
  103. data/src/core/lib/channel/promise_based_filter.cc +18 -19
  104. data/src/core/lib/channel/status_util.cc +27 -0
  105. data/src/core/lib/channel/status_util.h +10 -0
  106. data/src/core/lib/config/core_configuration.cc +5 -1
  107. data/src/core/lib/config/core_configuration.h +33 -0
  108. data/src/core/lib/debug/stats.cc +26 -30
  109. data/src/core/lib/debug/stats.h +2 -12
  110. data/src/core/lib/debug/stats_data.cc +118 -614
  111. data/src/core/lib/debug/stats_data.h +67 -465
  112. data/src/core/lib/debug/trace.cc +0 -2
  113. data/src/core/lib/event_engine/channel_args_endpoint_config.cc +12 -20
  114. data/src/core/lib/event_engine/channel_args_endpoint_config.h +13 -7
  115. data/src/core/lib/event_engine/forkable.cc +1 -1
  116. data/src/core/lib/event_engine/poller.h +14 -12
  117. data/src/core/lib/event_engine/posix_engine/timer_manager.cc +53 -32
  118. data/src/core/lib/event_engine/posix_engine/timer_manager.h +23 -1
  119. data/src/core/lib/event_engine/thread_pool.cc +131 -94
  120. data/src/core/lib/event_engine/thread_pool.h +56 -23
  121. data/src/core/lib/event_engine/time_util.cc +30 -0
  122. data/src/core/lib/event_engine/time_util.h +32 -0
  123. data/src/core/lib/event_engine/utils.cc +0 -5
  124. data/src/core/lib/event_engine/utils.h +0 -4
  125. data/src/core/lib/event_engine/windows/iocp.cc +13 -7
  126. data/src/core/lib/event_engine/windows/iocp.h +2 -1
  127. data/src/core/lib/event_engine/windows/win_socket.cc +1 -1
  128. data/src/core/lib/experiments/config.cc +146 -0
  129. data/src/core/lib/experiments/config.h +43 -0
  130. data/src/core/lib/experiments/experiments.cc +75 -0
  131. data/src/core/lib/experiments/experiments.h +56 -0
  132. data/src/core/lib/gpr/alloc.cc +1 -9
  133. data/src/core/lib/gpr/log_windows.cc +0 -1
  134. data/src/core/lib/gpr/string_util_windows.cc +3 -30
  135. data/src/core/lib/gpr/sync_abseil.cc +0 -14
  136. data/src/core/lib/gpr/sync_posix.cc +0 -14
  137. data/src/core/lib/gpr/time_posix.cc +0 -6
  138. data/src/core/lib/gpr/time_precise.h +1 -1
  139. data/src/core/lib/gpr/tmpfile_windows.cc +5 -7
  140. data/src/core/lib/gpr/useful.h +11 -0
  141. data/src/core/lib/{gpr → gprpp}/env.h +25 -12
  142. data/src/core/lib/{gpr → gprpp}/env_linux.cc +20 -15
  143. data/src/core/lib/{gpr → gprpp}/env_posix.cc +11 -10
  144. data/src/core/lib/gprpp/env_windows.cc +56 -0
  145. data/src/core/lib/gprpp/fork.cc +14 -22
  146. data/src/core/lib/gprpp/fork.h +0 -8
  147. data/src/core/lib/gprpp/global_config_env.cc +7 -6
  148. data/src/core/lib/gprpp/notification.h +67 -0
  149. data/src/core/lib/gprpp/packed_table.h +40 -0
  150. data/src/core/lib/gprpp/ref_counted_ptr.h +20 -33
  151. data/src/core/lib/gprpp/sorted_pack.h +98 -0
  152. data/src/core/lib/gprpp/status_helper.h +6 -0
  153. data/src/core/lib/gprpp/table.h +9 -1
  154. data/src/core/lib/gprpp/tchar.cc +49 -0
  155. data/src/core/lib/gprpp/tchar.h +33 -0
  156. data/src/core/lib/gprpp/time.cc +21 -0
  157. data/src/core/lib/gprpp/time.h +55 -0
  158. data/src/core/lib/gprpp/validation_errors.cc +61 -0
  159. data/src/core/lib/gprpp/validation_errors.h +110 -0
  160. data/src/core/{ext/filters/client_channel → lib/handshaker}/proxy_mapper.h +3 -3
  161. data/src/core/{ext/filters/client_channel → lib/handshaker}/proxy_mapper_registry.cc +14 -36
  162. data/src/core/lib/handshaker/proxy_mapper_registry.h +75 -0
  163. data/src/core/lib/iomgr/call_combiner.cc +0 -8
  164. data/src/core/lib/iomgr/closure.h +0 -1
  165. data/src/core/lib/iomgr/endpoint_pair_posix.cc +14 -10
  166. data/src/core/lib/iomgr/endpoint_pair_windows.cc +2 -2
  167. data/src/core/lib/iomgr/ev_epoll1_linux.cc +1 -38
  168. data/src/core/lib/iomgr/ev_poll_posix.cc +2 -17
  169. data/src/core/lib/iomgr/exec_ctx.cc +0 -10
  170. data/src/core/lib/iomgr/exec_ctx.h +7 -31
  171. data/src/core/lib/iomgr/iocp_windows.cc +1 -2
  172. data/src/core/lib/iomgr/iomgr.cc +6 -8
  173. data/src/core/lib/iomgr/iomgr_fwd.h +1 -0
  174. data/src/core/lib/iomgr/pollset.h +1 -1
  175. data/src/core/lib/iomgr/pollset_set.h +0 -1
  176. data/src/core/lib/iomgr/resolve_address.h +1 -0
  177. data/src/core/lib/iomgr/resolve_address_impl.h +1 -0
  178. data/src/core/lib/iomgr/resolve_address_posix.cc +1 -0
  179. data/src/core/lib/iomgr/resolve_address_windows.cc +1 -0
  180. data/src/core/lib/iomgr/sockaddr_utils_posix.cc +2 -1
  181. data/src/core/lib/iomgr/socket_utils_common_posix.cc +12 -34
  182. data/src/core/lib/iomgr/socket_utils_posix.cc +83 -1
  183. data/src/core/lib/iomgr/socket_utils_posix.h +98 -6
  184. data/src/core/lib/iomgr/tcp_client.cc +6 -7
  185. data/src/core/lib/iomgr/tcp_client.h +11 -11
  186. data/src/core/lib/iomgr/tcp_client_cfstream.cc +6 -6
  187. data/src/core/lib/iomgr/tcp_client_posix.cc +33 -29
  188. data/src/core/lib/iomgr/tcp_client_posix.h +12 -9
  189. data/src/core/lib/iomgr/tcp_client_windows.cc +6 -6
  190. data/src/core/lib/iomgr/tcp_posix.cc +131 -114
  191. data/src/core/lib/iomgr/tcp_posix.h +3 -1
  192. data/src/core/lib/iomgr/tcp_server.cc +5 -4
  193. data/src/core/lib/iomgr/tcp_server.h +9 -6
  194. data/src/core/lib/iomgr/tcp_server_posix.cc +17 -28
  195. data/src/core/lib/iomgr/tcp_server_utils_posix.h +2 -2
  196. data/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +3 -3
  197. data/src/core/lib/iomgr/tcp_server_windows.cc +6 -7
  198. data/src/core/lib/iomgr/tcp_windows.cc +0 -1
  199. data/src/core/lib/iomgr/tcp_windows.h +0 -1
  200. data/src/core/lib/iomgr/timer_generic.cc +4 -4
  201. data/src/core/lib/iomgr/timer_manager.cc +1 -2
  202. data/src/core/lib/iomgr/wakeup_fd_eventfd.cc +0 -2
  203. data/src/core/lib/json/json_object_loader.cc +21 -52
  204. data/src/core/lib/json/json_object_loader.h +56 -76
  205. data/src/core/lib/json/json_util.cc +2 -1
  206. data/src/core/lib/load_balancing/lb_policy.h +5 -5
  207. data/src/core/lib/load_balancing/lb_policy_registry.cc +29 -55
  208. data/src/core/lib/load_balancing/lb_policy_registry.h +23 -11
  209. data/src/core/lib/promise/activity.h +2 -3
  210. data/src/core/lib/promise/context.h +1 -1
  211. data/src/core/lib/promise/sleep.cc +16 -4
  212. data/src/core/lib/promise/sleep.h +8 -2
  213. data/src/core/lib/resolver/resolver.h +13 -3
  214. data/src/core/lib/resource_quota/api.cc +9 -0
  215. data/src/core/lib/resource_quota/api.h +6 -0
  216. data/src/core/lib/resource_quota/arena.cc +1 -3
  217. data/src/core/lib/resource_quota/memory_quota.cc +8 -24
  218. data/src/core/lib/resource_quota/memory_quota.h +6 -19
  219. data/src/core/lib/resource_quota/periodic_update.cc +2 -3
  220. data/src/core/{ext/xds → lib/security/certificate_provider}/certificate_provider_factory.h +3 -3
  221. data/src/core/lib/security/certificate_provider/certificate_provider_registry.cc +60 -0
  222. data/src/core/lib/security/certificate_provider/certificate_provider_registry.h +70 -0
  223. data/src/core/lib/security/credentials/channel_creds_registry_init.cc +1 -0
  224. data/src/core/lib/security/credentials/external/aws_external_account_credentials.cc +15 -16
  225. data/src/core/lib/security/credentials/external/external_account_credentials.cc +2 -1
  226. data/src/core/lib/security/credentials/google_default/credentials_generic.cc +5 -8
  227. data/src/core/lib/security/credentials/google_default/google_default_credentials.cc +6 -6
  228. data/src/core/lib/security/credentials/jwt/jwt_verifier.cc +3 -2
  229. data/src/core/lib/security/credentials/jwt/jwt_verifier.h +1 -1
  230. data/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +1 -2
  231. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.cc +4 -3
  232. data/src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h +4 -2
  233. data/src/core/lib/security/credentials/tls/tls_utils.cc +3 -1
  234. data/src/core/lib/security/transport/client_auth_filter.cc +12 -1
  235. data/src/core/lib/security/transport/secure_endpoint.cc +0 -4
  236. data/src/core/lib/surface/call.cc +1 -11
  237. data/src/core/lib/surface/channel.cc +3 -2
  238. data/src/core/lib/surface/completion_queue.cc +16 -28
  239. data/src/core/lib/surface/completion_queue.h +1 -1
  240. data/src/core/lib/surface/completion_queue_factory.cc +5 -0
  241. data/src/core/lib/surface/init.cc +16 -11
  242. data/src/core/lib/surface/init_internally.cc +24 -0
  243. data/src/core/lib/surface/init_internally.h +28 -0
  244. data/src/core/lib/surface/server.cc +1 -7
  245. data/src/core/lib/surface/server.h +4 -6
  246. data/src/core/lib/surface/version.cc +2 -2
  247. data/src/core/lib/transport/bdp_estimator.cc +1 -3
  248. data/src/core/lib/transport/metadata_batch.cc +2 -3
  249. data/src/core/lib/transport/metadata_batch.h +9 -7
  250. data/src/core/lib/transport/parsed_metadata.h +4 -2
  251. data/src/core/lib/transport/status_conversion.cc +1 -3
  252. data/src/core/lib/transport/tcp_connect_handshaker.cc +9 -5
  253. data/src/core/lib/transport/transport.h +0 -1
  254. data/src/core/lib/transport/transport_impl.h +0 -1
  255. data/src/core/plugin_registry/grpc_plugin_registry.cc +23 -46
  256. data/src/core/plugin_registry/grpc_plugin_registry_extra.cc +13 -25
  257. data/src/ruby/lib/grpc/2.6/grpc_c.so +0 -0
  258. data/src/ruby/lib/grpc/2.7/grpc_c.so +0 -0
  259. data/src/ruby/lib/grpc/3.0/grpc_c.so +0 -0
  260. data/src/ruby/lib/grpc/3.1/grpc_c.so +0 -0
  261. data/src/ruby/lib/grpc/grpc_c.so +0 -0
  262. data/src/ruby/lib/grpc/version.rb +1 -1
  263. data/src/ruby/spec/channel_spec.rb +5 -0
  264. data/src/ruby/spec/generic/server_interceptors_spec.rb +1 -1
  265. data/src/ruby/spec/user_agent_spec.rb +1 -1
  266. metadata +33 -19
  267. data/src/core/ext/filters/client_channel/proxy_mapper_registry.h +0 -56
  268. data/src/core/ext/xds/certificate_provider_registry.cc +0 -103
  269. data/src/core/ext/xds/certificate_provider_registry.h +0 -59
  270. data/src/core/lib/event_engine/promise.h +0 -78
  271. data/src/core/lib/gpr/env_windows.cc +0 -74
  272. data/src/core/lib/gpr/string_windows.h +0 -32
  273. data/src/core/lib/profiling/basic_timers.cc +0 -295
  274. data/src/core/lib/profiling/stap_timers.cc +0 -50
  275. data/src/core/lib/profiling/timers.h +0 -94
@@ -35,7 +35,6 @@
35
35
  #include <grpc/support/time.h>
36
36
 
37
37
  #include "src/core/lib/address_utils/sockaddr_utils.h"
38
- #include "src/core/lib/channel/channel_args.h"
39
38
  #include "src/core/lib/gpr/string.h"
40
39
  #include "src/core/lib/iomgr/ev_posix.h"
41
40
  #include "src/core/lib/iomgr/executor.h"
@@ -51,6 +50,8 @@
51
50
 
52
51
  extern grpc_core::TraceFlag grpc_tcp_trace;
53
52
 
53
+ using ::grpc_event_engine::experimental::EndpointConfig;
54
+
54
55
  struct async_connect {
55
56
  gpr_mu mu;
56
57
  grpc_fd* fd;
@@ -62,9 +63,9 @@ struct async_connect {
62
63
  std::string addr_str;
63
64
  grpc_endpoint** ep;
64
65
  grpc_closure* closure;
65
- grpc_channel_args* channel_args;
66
66
  int64_t connection_handle;
67
67
  bool connect_cancelled;
68
+ grpc_core::PosixTcpOptions options;
68
69
  };
69
70
 
70
71
  struct ConnectionShard {
@@ -90,9 +91,9 @@ void grpc_tcp_client_global_init() {
90
91
  gpr_once_init(&g_tcp_client_posix_init, do_tcp_client_global_init);
91
92
  }
92
93
 
93
- static grpc_error_handle prepare_socket(const grpc_resolved_address* addr,
94
- int fd,
95
- const grpc_channel_args* channel_args) {
94
+ static grpc_error_handle prepare_socket(
95
+ const grpc_resolved_address* addr, int fd,
96
+ const grpc_core::PosixTcpOptions& options) {
96
97
  grpc_error_handle err = GRPC_ERROR_NONE;
97
98
 
98
99
  GPR_ASSERT(fd >= 0);
@@ -106,15 +107,14 @@ static grpc_error_handle prepare_socket(const grpc_resolved_address* addr,
106
107
  if (!GRPC_ERROR_IS_NONE(err)) goto error;
107
108
  err = grpc_set_socket_reuse_addr(fd, 1);
108
109
  if (!GRPC_ERROR_IS_NONE(err)) goto error;
109
- err = grpc_set_socket_tcp_user_timeout(fd, channel_args,
110
- true /* is_client */);
110
+ err = grpc_set_socket_tcp_user_timeout(fd, options, true /* is_client */);
111
111
  if (!GRPC_ERROR_IS_NONE(err)) goto error;
112
112
  }
113
113
  err = grpc_set_socket_no_sigpipe_if_possible(fd);
114
114
  if (!GRPC_ERROR_IS_NONE(err)) goto error;
115
115
 
116
116
  err = grpc_apply_socket_mutator_in_args(fd, GRPC_FD_CLIENT_CONNECTION_USAGE,
117
- channel_args);
117
+ options);
118
118
  if (!GRPC_ERROR_IS_NONE(err)) goto error;
119
119
 
120
120
  goto done;
@@ -143,15 +143,20 @@ static void tc_on_alarm(void* acp, grpc_error_handle error) {
143
143
  gpr_mu_unlock(&ac->mu);
144
144
  if (done) {
145
145
  gpr_mu_destroy(&ac->mu);
146
- grpc_channel_args_destroy(ac->channel_args);
147
146
  delete ac;
148
147
  }
149
148
  }
150
149
 
151
- grpc_endpoint* grpc_tcp_client_create_from_fd(
152
- grpc_fd* fd, const grpc_channel_args* channel_args,
150
+ static grpc_endpoint* grpc_tcp_client_create_from_fd(
151
+ grpc_fd* fd, const grpc_core::PosixTcpOptions& options,
152
+ absl::string_view addr_str) {
153
+ return grpc_tcp_create(fd, options, addr_str);
154
+ }
155
+
156
+ grpc_endpoint* grpc_tcp_create_from_fd(
157
+ grpc_fd* fd, const grpc_event_engine::experimental::EndpointConfig& config,
153
158
  absl::string_view addr_str) {
154
- return grpc_tcp_create(fd, channel_args, addr_str);
159
+ return grpc_tcp_create(fd, TcpOptionsFromEndpointConfig(config), addr_str);
155
160
  }
156
161
 
157
162
  static void on_writable(void* acp, grpc_error_handle error) {
@@ -207,7 +212,7 @@ static void on_writable(void* acp, grpc_error_handle error) {
207
212
  switch (so_error) {
208
213
  case 0:
209
214
  grpc_pollset_set_del_fd(ac->interested_parties, fd);
210
- *ep = grpc_tcp_client_create_from_fd(fd, ac->channel_args, ac->addr_str);
215
+ *ep = grpc_tcp_client_create_from_fd(fd, ac->options, ac->addr_str);
211
216
  fd = nullptr;
212
217
  break;
213
218
  case ENOBUFS:
@@ -269,7 +274,6 @@ finish:
269
274
  // This is safe even outside the lock, because "done", the sentinel, is
270
275
  // populated *inside* the lock.
271
276
  gpr_mu_destroy(&ac->mu);
272
- grpc_channel_args_destroy(ac->channel_args);
273
277
  delete ac;
274
278
  }
275
279
  // Push async connect closure to the executor since this may actually be
@@ -284,8 +288,9 @@ finish:
284
288
  }
285
289
 
286
290
  grpc_error_handle grpc_tcp_client_prepare_fd(
287
- const grpc_channel_args* channel_args, const grpc_resolved_address* addr,
288
- grpc_resolved_address* mapped_addr, int* fd) {
291
+ const grpc_core::PosixTcpOptions& options,
292
+ const grpc_resolved_address* addr, grpc_resolved_address* mapped_addr,
293
+ int* fd) {
289
294
  grpc_dualstack_mode dsmode;
290
295
  grpc_error_handle error;
291
296
  *fd = -1;
@@ -306,8 +311,7 @@ grpc_error_handle grpc_tcp_client_prepare_fd(
306
311
  memcpy(mapped_addr, addr, sizeof(*mapped_addr));
307
312
  }
308
313
  }
309
- if ((error = prepare_socket(mapped_addr, *fd, channel_args)) !=
310
- GRPC_ERROR_NONE) {
314
+ if ((error = prepare_socket(mapped_addr, *fd, options)) != GRPC_ERROR_NONE) {
311
315
  return error;
312
316
  }
313
317
  return GRPC_ERROR_NONE;
@@ -315,8 +319,9 @@ grpc_error_handle grpc_tcp_client_prepare_fd(
315
319
 
316
320
  int64_t grpc_tcp_client_create_from_prepared_fd(
317
321
  grpc_pollset_set* interested_parties, grpc_closure* closure, const int fd,
318
- const grpc_channel_args* channel_args, const grpc_resolved_address* addr,
319
- grpc_core::Timestamp deadline, grpc_endpoint** ep) {
322
+ const grpc_core::PosixTcpOptions& options,
323
+ const grpc_resolved_address* addr, grpc_core::Timestamp deadline,
324
+ grpc_endpoint** ep) {
320
325
  int err;
321
326
  do {
322
327
  err = connect(fd, reinterpret_cast<const grpc_sockaddr*>(addr->addr),
@@ -342,7 +347,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
342
347
  if (err >= 0) {
343
348
  // Connection already succeded. Return 0 to discourage any cancellation
344
349
  // attempts.
345
- *ep = grpc_tcp_client_create_from_fd(fdobj, channel_args, addr_uri.value());
350
+ *ep = grpc_tcp_client_create_from_fd(fdobj, options, addr_uri.value());
346
351
  grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, GRPC_ERROR_NONE);
347
352
  return 0;
348
353
  }
@@ -371,7 +376,7 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
371
376
  ac->refs = 2;
372
377
  GRPC_CLOSURE_INIT(&ac->write_closure, on_writable, ac,
373
378
  grpc_schedule_on_exec_ctx);
374
- ac->channel_args = grpc_channel_args_copy(channel_args);
379
+ ac->options = options;
375
380
 
376
381
  if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) {
377
382
  gpr_log(GPR_INFO, "CLIENT_CONNECT: %s: asynchronously connecting fd %p",
@@ -395,21 +400,21 @@ int64_t grpc_tcp_client_create_from_prepared_fd(
395
400
 
396
401
  static int64_t tcp_connect(grpc_closure* closure, grpc_endpoint** ep,
397
402
  grpc_pollset_set* interested_parties,
398
- const grpc_channel_args* channel_args,
403
+ const EndpointConfig& config,
399
404
  const grpc_resolved_address* addr,
400
405
  grpc_core::Timestamp deadline) {
401
406
  grpc_resolved_address mapped_addr;
407
+ grpc_core::PosixTcpOptions options(TcpOptionsFromEndpointConfig(config));
402
408
  int fd = -1;
403
409
  grpc_error_handle error;
404
410
  *ep = nullptr;
405
- if ((error = grpc_tcp_client_prepare_fd(channel_args, addr, &mapped_addr,
406
- &fd)) != GRPC_ERROR_NONE) {
411
+ if ((error = grpc_tcp_client_prepare_fd(options, addr, &mapped_addr, &fd)) !=
412
+ GRPC_ERROR_NONE) {
407
413
  grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, error);
408
414
  return 0;
409
415
  }
410
- return grpc_tcp_client_create_from_prepared_fd(interested_parties, closure,
411
- fd, channel_args, &mapped_addr,
412
- deadline, ep);
416
+ return grpc_tcp_client_create_from_prepared_fd(
417
+ interested_parties, closure, fd, options, &mapped_addr, deadline, ep);
413
418
  }
414
419
 
415
420
  static bool tcp_cancel_connect(int64_t connection_handle) {
@@ -458,7 +463,6 @@ static bool tcp_cancel_connect(int64_t connection_handle) {
458
463
  // This is safe even outside the lock, because "done", the sentinel, is
459
464
  // populated *inside* the lock.
460
465
  gpr_mu_destroy(&ac->mu);
461
- grpc_channel_args_destroy(ac->channel_args);
462
466
  delete ac;
463
467
  }
464
468
  return connection_cancel_success;
@@ -23,23 +23,24 @@
23
23
 
24
24
  #include "src/core/lib/iomgr/endpoint.h"
25
25
  #include "src/core/lib/iomgr/ev_posix.h"
26
+ #include "src/core/lib/iomgr/socket_utils_posix.h"
26
27
  #include "src/core/lib/iomgr/tcp_client.h"
27
28
 
28
29
  /* Create an endpoint from a connected grpc_fd.
29
30
 
30
31
  fd: a connected FD. Ownership is taken.
31
- channel_args: may contain custom settings for the endpoint
32
+ config: may contain custom settings for the endpoint
32
33
  addr_str: destination address in printable format
33
34
  slice_allocator: ownership is taken by client.
34
35
  Returns: a new endpoint
35
36
  */
36
- grpc_endpoint* grpc_tcp_client_create_from_fd(
37
- grpc_fd* fd, const grpc_channel_args* channel_args,
37
+ grpc_endpoint* grpc_tcp_create_from_fd(
38
+ grpc_fd* fd, const grpc_event_engine::experimental::EndpointConfig& config,
38
39
  absl::string_view addr_str);
39
40
 
40
41
  /* Return a configured, unbound, unconnected TCP client fd.
41
42
 
42
- channel_args: may contain custom settings for the fd
43
+ options: may contain custom settings for the fd
43
44
  addr: the destination address
44
45
  mapped_addr: out parameter. addr mapped to an address appropriate to the
45
46
  type of socket FD created. For example, if addr is IPv4 and dual stack
@@ -48,8 +49,9 @@ grpc_endpoint* grpc_tcp_client_create_from_fd(
48
49
  Returns: error, if any. Out parameters are not set on error
49
50
  */
50
51
  grpc_error_handle grpc_tcp_client_prepare_fd(
51
- const grpc_channel_args* channel_args, const grpc_resolved_address* addr,
52
- grpc_resolved_address* mapped_addr, int* fd);
52
+ const grpc_core::PosixTcpOptions& options,
53
+ const grpc_resolved_address* addr, grpc_resolved_address* mapped_addr,
54
+ int* fd);
53
55
 
54
56
  /* Connect a configured TCP client fd.
55
57
 
@@ -57,13 +59,14 @@ grpc_error_handle grpc_tcp_client_prepare_fd(
57
59
  connection being established (in order to continue their work
58
60
  closure: called when complete. On success, *ep will be set.
59
61
  fd: an FD returned from grpc_tcp_client_prepare_fd().
60
- channel_args: may contain custom settings for the endpoint
62
+ options: may contain custom settings for the endpoint
61
63
  deadline: connection deadline
62
64
  ep: out parameter. Set before closure is called if successful
63
65
  */
64
66
  int64_t grpc_tcp_client_create_from_prepared_fd(
65
67
  grpc_pollset_set* interested_parties, grpc_closure* closure, const int fd,
66
- const grpc_channel_args* channel_args, const grpc_resolved_address* addr,
67
- grpc_core::Timestamp deadline, grpc_endpoint** ep);
68
+ const grpc_core::PosixTcpOptions& options,
69
+ const grpc_resolved_address* addr, grpc_core::Timestamp deadline,
70
+ grpc_endpoint** ep);
68
71
 
69
72
  #endif /* GRPC_CORE_LIB_IOMGR_TCP_CLIENT_POSIX_H */
@@ -24,13 +24,13 @@
24
24
 
25
25
  #ifdef GRPC_WINSOCK_SOCKET
26
26
 
27
+ #include <grpc/event_engine/endpoint_config.h>
27
28
  #include <grpc/slice_buffer.h>
28
29
  #include <grpc/support/alloc.h>
29
30
  #include <grpc/support/log.h>
30
31
  #include <grpc/support/log_windows.h>
31
32
 
32
33
  #include "src/core/lib/address_utils/sockaddr_utils.h"
33
- #include "src/core/lib/channel/channel_args.h"
34
34
  #include "src/core/lib/iomgr/iocp_windows.h"
35
35
  #include "src/core/lib/iomgr/sockaddr.h"
36
36
  #include "src/core/lib/iomgr/sockaddr_windows.h"
@@ -38,8 +38,11 @@
38
38
  #include "src/core/lib/iomgr/tcp_client.h"
39
39
  #include "src/core/lib/iomgr/tcp_windows.h"
40
40
  #include "src/core/lib/iomgr/timer.h"
41
+ #include "src/core/lib/resource_quota/api.h"
41
42
  #include "src/core/lib/slice/slice_internal.h"
42
43
 
44
+ using ::grpc_event_engine::experimental::EndpointConfig;
45
+
43
46
  struct async_connect {
44
47
  grpc_closure* on_done;
45
48
  gpr_mu mu;
@@ -50,7 +53,6 @@ struct async_connect {
50
53
  int refs;
51
54
  grpc_closure on_connect;
52
55
  grpc_endpoint** endpoint;
53
- grpc_channel_args* channel_args;
54
56
  };
55
57
 
56
58
  static void async_connect_unlock_and_cleanup(async_connect* ac,
@@ -58,7 +60,6 @@ static void async_connect_unlock_and_cleanup(async_connect* ac,
58
60
  int done = (--ac->refs == 0);
59
61
  gpr_mu_unlock(&ac->mu);
60
62
  if (done) {
61
- grpc_channel_args_destroy(ac->channel_args);
62
63
  gpr_mu_destroy(&ac->mu);
63
64
  delete ac;
64
65
  }
@@ -105,7 +106,7 @@ static void on_connect(void* acp, grpc_error_handle error) {
105
106
  error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx");
106
107
  closesocket(socket->socket);
107
108
  } else {
108
- *ep = grpc_tcp_create(socket, ac->channel_args, ac->addr_name);
109
+ *ep = grpc_tcp_create(socket, ac->addr_name);
109
110
  socket = nullptr;
110
111
  }
111
112
  } else {
@@ -123,7 +124,7 @@ static void on_connect(void* acp, grpc_error_handle error) {
123
124
  notification request for the connection, and one timeout alert. */
124
125
  static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
125
126
  grpc_pollset_set* interested_parties,
126
- const grpc_channel_args* channel_args,
127
+ const EndpointConfig& config,
127
128
  const grpc_resolved_address* addr,
128
129
  grpc_core::Timestamp deadline) {
129
130
  SOCKET sock = INVALID_SOCKET;
@@ -208,7 +209,6 @@ static int64_t tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint,
208
209
  ac->refs = 2;
209
210
  ac->addr_name = addr_uri.value();
210
211
  ac->endpoint = endpoint;
211
- ac->channel_args = grpc_channel_args_copy(channel_args);
212
212
  GRPC_CLOSURE_INIT(&ac->on_connect, on_connect, ac, grpc_schedule_on_exec_ctx);
213
213
 
214
214
  GRPC_CLOSURE_INIT(&ac->on_alarm, on_alarm, ac, grpc_schedule_on_exec_ctx);